Mercurial > octave
diff libinterp/dldfcn/__fltk_uigetfile__.cc @ 30196:813b7827c5f8
Remove "position" argument from file dialog functions (bug #60980).
* libinterp/corefcn/event-manager.cc (F__event_manager_file_dialog__),
libinterp/dldfcn/__fltk_uigetfile (F__fltk_uigetfile__): Remove unused
argument "position".
* scripts/gui/uigetdir.m, scripts/gui/uigetfile.m, scripts/gui/uiputfile.m,
scripts/gui/private/__uigetdir_fltk__.m,
scripts/gui/private/__uigetfile_fltk__.m,
scripts/gui/private/__uiputfile_fltk__.m: Remove handling argument "position".
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 19 Sep 2021 17:06:26 +0200 |
| parents | 7d6709900da7 |
| children | 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc Sun Sep 19 15:36:19 2021 +0200 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Sun Sep 19 17:06:26 2021 +0200 @@ -29,20 +29,20 @@ #if defined (HAVE_FLTK) -#if defined (WIN32) -# define WIN32_LEAN_AND_MEAN -#endif +# if defined (WIN32) +# define WIN32_LEAN_AND_MEAN +# endif -#include <string> +# include <string> -#include <FL/Fl.H> -#include <FL/Fl_File_Chooser.H> +# include <FL/Fl.H> +# include <FL/Fl_File_Chooser.H> // FLTK headers may include X11/X.h which defines Complex, and that // conflicts with Octave's Complex typedef. We don't need the X11 // Complex definition in this file, so remove it before including Octave // headers which may require Octave's Complex typedef. -#undef Complex +# undef Complex #endif @@ -69,20 +69,18 @@ // args(0) ... FileFilter in fltk format // args(1) ... Title // args(2) ... Default Filename - // args(3) ... PositionValue [x,y] - // args(4) ... SelectValue "on"/"off"/"dir"/"create" + // args(3) ... SelectValue "on"/"off"/"dir"/"create" octave_value_list retval (3, octave_value (0)); std::string file_filter = args(0).string_value (); std::string title = args(1).string_value (); std::string default_name = args(2).string_value (); - Matrix pos = args(3).matrix_value (); int multi_type = Fl_File_Chooser::SINGLE; std::string flabel = "Filename:"; - std::string multi = args(4).string_value (); + std::string multi = args(3).string_value (); if (multi == "on") multi_type = Fl_File_Chooser::MULTI; else if (multi == "dir")