# HG changeset patch # User Rik # Date 1424803317 28800 # Node ID 9b7ca334a1047b8636475b4c2f5c8d4e48cd4abf # Parent 597fc0fd8e54fe7cc506d6555aea4f6def5facb1 Backout cset a9952a647d52 and use __octave_link_enabled__ rather than isguirunning. diff -r 597fc0fd8e54 -r 9b7ca334a104 scripts/gui/inputdlg.m --- 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", diff -r 597fc0fd8e54 -r 9b7ca334a104 scripts/gui/listdlg.m --- 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); diff -r 597fc0fd8e54 -r 9b7ca334a104 scripts/gui/questdlg.m --- 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")) diff -r 597fc0fd8e54 -r 9b7ca334a104 scripts/gui/uigetdir.m --- 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]; diff -r 597fc0fd8e54 -r 9b7ca334a104 scripts/gui/uigetfile.m --- 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 ()); diff -r 597fc0fd8e54 -r 9b7ca334a104 scripts/gui/uiputfile.m --- 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 ());