Mercurial > octave-nkf

changeset 19882:9b7ca334a104

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout cset a9952a647d52 and use __octave_link_enabled__ rather than isguirunning.
author Rik <rik@octave.org>
date Tue, 24 Feb 2015 10:41:57 -0800
parents 597fc0fd8e54
children 1c9ed5b4c73d
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	Tue Feb 24 09:35:34 2015 +0100
+++ b/scripts/gui/inputdlg.m	Tue Feb 24 10:41:57 2015 -0800
@@ -127,7 +127,7 @@
   defs = cellfun (@num2str, defaults, "UniformOutput", false);
   rc = arrayfun (@num2str, rowscols, "UniformOutput", false);
 
-  if (isguirunning ())
+  if (__octave_link_enabled__ ())
     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	Tue Feb 24 09:35:34 2015 +0100
+++ b/scripts/gui/listdlg.m	Tue Feb 24 10:41:57 2015 -0800
@@ -128,7 +128,7 @@
     error ("invalid SelectionMode");
   endif
 
-  if (isguirunning ())
+  if (__octave_link_enabled__ ())
     [sel, ok] = __octave_link_list_dialog__ (listcell, selmode, listsize,
                                              initialvalue, name, prompt,
                                              okstring, cancelstring);
--- a/scripts/gui/questdlg.m	Tue Feb 24 09:35:34 2015 +0100
+++ b/scripts/gui/questdlg.m	Tue Feb 24 10:41:57 2015 -0800
@@ -109,7 +109,7 @@
 
   endswitch
 
-  if (isguirunning ())
+  if (__octave_link_enabled__ ())
     btn = __octave_link_question_dialog__ (msg, title, options{1}, options{2},
                                            options{3}, options{4});
   elseif (__have_feature__ ("JAVA"))
--- a/scripts/gui/uigetdir.m	Tue Feb 24 09:35:34 2015 +0100
+++ b/scripts/gui/uigetdir.m	Tue Feb 24 10:41:57 2015 -0800
@@ -43,7 +43,7 @@
     init_path = fileparts (init_path);
   endif
 
-  if (isguirunning ())
+  if (__octave_link_enabled__ ())
     file_filter = cell (0, 2);
     default_file_name = "";
     dialog_position = [240, 120];
--- a/scripts/gui/uigetfile.m	Tue Feb 24 09:35:34 2015 +0100
+++ b/scripts/gui/uigetfile.m	Tue Feb 24 10:41:57 2015 -0800
@@ -173,7 +173,7 @@
     endfor
   endif
 
-  if (isguirunning ())
+  if (__octave_link_enabled__ ())
     [retfile, retpath, retindex] = __octave_link_file_dialog__ (outargs{:});
   else
     funcname = __get_funcname__ (mfilename ());
--- a/scripts/gui/uiputfile.m	Tue Feb 24 09:35:34 2015 +0100
+++ b/scripts/gui/uiputfile.m	Tue Feb 24 10:41:57 2015 -0800
@@ -107,7 +107,7 @@
     endif
   endif
 
-  if (isguirunning ())
+  if (__octave_link_enabled__ ())
     [retfile, retpath, retindex] = __octave_link_file_dialog__ (outargs{:});
   else
     funcname = __get_funcname__ (mfilename ());