Mercurial > octave-nkf
changeset 19833:a9952a647d52
Use isguirunning rather than __octave_link_enabled__ in m-files for clarity.
* inputdlg.m, listdlg.m, questdlg.m, uigetdir.m, uigetfile.m, uiputfile.m:
Use isguirunning() rather than __octave_link_enabled__().
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 20 Feb 2015 17:16:21 -0800 |
| parents | 925fdd91abba |
| children | be7b05f95d7c |
| files | scripts/gui/inputdlg.m scripts/gui/listdlg.m scripts/gui/questdlg.m scripts/gui/uigetdir.m scripts/gui/uigetfile.m scripts/gui/uiputfile.m |
| diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/gui/inputdlg.m Fri Feb 20 19:36:35 2015 -0500 +++ b/scripts/gui/inputdlg.m Fri Feb 20 17:16:21 2015 -0800 @@ -127,7 +127,7 @@ defs = cellfun (@num2str, defaults, "UniformOutput", false); rc = arrayfun (@num2str, rowscols, "UniformOutput", false); - if (__octave_link_enabled__ ()) + if (isguirunning ()) cstr = __octave_link_input_dialog__ (prompt, title, rowscols, defs); elseif (__have_feature__ ("JAVA")) user_inputs = javaMethod ("inputdlg", "org.octave.JDialogBox",
--- a/scripts/gui/listdlg.m Fri Feb 20 19:36:35 2015 -0500 +++ b/scripts/gui/listdlg.m Fri Feb 20 17:16:21 2015 -0800 @@ -128,7 +128,7 @@ error ("invalid SelectionMode"); endif - if (__octave_link_enabled__ ()) + if (isguirunning ()) [sel, ok] = __octave_link_list_dialog__ (listcell, selmode, listsize, initialvalue, name, prompt, okstring, cancelstring);
--- a/scripts/gui/questdlg.m Fri Feb 20 19:36:35 2015 -0500 +++ b/scripts/gui/questdlg.m Fri Feb 20 17:16:21 2015 -0800 @@ -109,7 +109,7 @@ endswitch - if (__octave_link_enabled__ ()) + if (isguirunning ()) btn = __octave_link_question_dialog__ (msg, title, options{1}, options{2}, options{3}, options{4}); elseif (__have_feature__ ("JAVA"))
--- a/scripts/gui/uigetdir.m Fri Feb 20 19:36:35 2015 -0500 +++ b/scripts/gui/uigetdir.m Fri Feb 20 17:16:21 2015 -0800 @@ -44,7 +44,7 @@ init_path = fileparts (init_path); endif - if (__octave_link_enabled__ ()) + if (isguirunning ()) file_filter = cell (0, 2); default_file_name = ""; dialog_position = [240, 120];
--- a/scripts/gui/uigetfile.m Fri Feb 20 19:36:35 2015 -0500 +++ b/scripts/gui/uigetfile.m Fri Feb 20 17:16:21 2015 -0800 @@ -178,7 +178,7 @@ endfor endif - if (__octave_link_enabled__ ()) + if (isguirunning ()) [retfile, retpath, retindex] = __octave_link_file_dialog__ (outargs{:}); else [retfile, retpath, retindex] = feval (funcname, outargs{:});
--- a/scripts/gui/uiputfile.m Fri Feb 20 19:36:35 2015 -0500 +++ b/scripts/gui/uiputfile.m Fri Feb 20 17:16:21 2015 -0800 @@ -111,7 +111,7 @@ endif endif - if (__octave_link_enabled__ ()) + if (isguirunning ()) [retfile, retpath, retindex] = __octave_link_file_dialog__ (outargs{:}); else [retfile, retpath, retindex] = feval (funcname, outargs{:});