diff options
| author | Matthias Melcher <github@matthiasm.com> | 2022-11-15 17:48:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 17:48:06 +0100 |
| commit | 3ecae0459caba7d8237502e4de2620641cb1e9b1 (patch) | |
| tree | 0bb547d130e71350c65d399f7ce0e715a870b284 /fluid/Fl_Function_Type.cxx | |
| parent | 7f8f7c5b851f4e15cf95c6e819bff284b7fda7ca (diff) | |
Improve Fluid argument handling and relative paths. (#545)
Fix typos, fix merge conflict.
Diffstat (limited to 'fluid/Fl_Function_Type.cxx')
| -rw-r--r-- | fluid/Fl_Function_Type.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx index 81ab35a9c..4d3c34464 100644 --- a/fluid/Fl_Function_Type.cxx +++ b/fluid/Fl_Function_Type.cxx @@ -1128,9 +1128,9 @@ void Fl_Data_Type::open() { if (w == data_panel_cancel) goto BREAK2; else if (w == data_panel_ok) break; else if (w == data_filebrowser) { - goto_designfile_dir(); + enter_project_dir(); const char *fn = fl_file_chooser("Load Inline Data", 0L, data_filename->value(), 1); - leave_designfile_dir(); + leave_project_dir(); if (fn) { if (strcmp(fn, data_filename->value())) set_modflag(1); @@ -1217,9 +1217,9 @@ void Fl_Data_Type::write_code1() { int nData = -1; // path should be set correctly already if (filename_ && !write_sourceview) { - goto_designfile_dir(); + enter_project_dir(); FILE *f = fl_fopen(filename_, "rb"); - leave_designfile_dir(); + leave_project_dir(); if (!f) { message = "Can't include data from file. Can't open"; } else { |