Mercurial > octave-nkf
changeset 18619:e7b347dcfc63 gui-release
maint: Periodic merge of stable to gui-release.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 22 Mar 2014 13:40:46 -0700 |
parents | 89b7bd7d0b83 (current diff) 51a0d1c1023c (diff) |
children | 3985333e13fa a87bdd302b1b |
files | scripts/gui/waitbar.m |
diffstat | 3 files changed, 23 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/gui/listdlg.m Sat Mar 22 13:39:55 2014 -0700 +++ b/scripts/gui/listdlg.m Sat Mar 22 13:40:46 2014 -0700 @@ -94,21 +94,21 @@ ## handle key, value pairs for i = 1:2:nargin-1 - if (strcmp (varargin{i}, "ListString")) + if (strcmpi (varargin{i}, "ListString")) listcell = varargin{i+1}; - elseif (strcmp (varargin{i}, "SelectionMode")) + elseif (strcmpi (varargin{i}, "SelectionMode")) selmode = varargin{i+1}; - elseif (strcmp (varargin{i}, "ListSize")) + elseif (strcmpi (varargin{i}, "ListSize")) listsize = varargin{i+1}; - elseif (strcmp (varargin{i}, "InitialValue")) + elseif (strcmpi (varargin{i}, "InitialValue")) initialvalue = varargin{i+1}; - elseif (strcmp (varargin{i}, "Name")) + elseif (strcmpi (varargin{i}, "Name")) name = varargin{i+1}; - elseif (strcmp (varargin{i}, "PromptString")) + elseif (strcmpi (varargin{i}, "PromptString")) prompt = varargin{i+1}; - elseif (strcmp (varargin{i}, "OKString")) + elseif (strcmpi (varargin{i}, "OKString")) okstring = varargin{i+1}; - elseif (strcmp (varargin{i}, "CancelString")) + elseif (strcmpi (varargin{i}, "CancelString")) cancelstring = varargin{i+1}; endif endfor @@ -130,8 +130,8 @@ if (__octave_link_enabled__ ()) [sel, ok] = __octave_link_list_dialog__ (listcell, selmode, listsize, - initialvalue, name, prompt, - okstring, cancelstring); + initialvalue, name, prompt, + okstring, cancelstring); elseif (__have_feature__ ("JAVA")) ## transform matrices to cell arrays of strings ## swap width and height to correct calling format for JDialogBox @@ -146,10 +146,14 @@ okstring, cancelstring); if (numel (ret) > 0) - sel = ret; + sel = zeros (1, numel (ret)); + ## for loop needed to convert Java array ret into Octave double sel + for i = 1:numel (ret) + sel(i) = ret(i); + endfor ok = 1; else - sel = {}; + sel = []; ok = 0; endif else
--- a/scripts/gui/waitbar.m Sat Mar 22 13:39:55 2014 -0700 +++ b/scripts/gui/waitbar.m Sat Mar 22 13:40:46 2014 -0700 @@ -130,9 +130,7 @@ endif title (ax, msg); - if (! isempty (cf)) - set (0, "currentfigure", cf); - endif + set (0, "currentfigure", cf); endif drawnow ();
--- a/scripts/io/textscan.m Sat Mar 22 13:39:55 2014 -0700 +++ b/scripts/io/textscan.m Sat Mar 22 13:40:46 2014 -0700 @@ -1,4 +1,4 @@ -## Copyright (C) 2010-2013 Ben Abbott +## Copyright (C) 2010-2014 Ben Abbott ## ## This file is part of Octave. ## @@ -135,6 +135,7 @@ if (! (isempty (args{ipos+1}) && has_str_fmt)) args{ipos+1} = unique ([" ", args{ipos+1}]); endif + whitespace = args{ipos+1}; endif if (! any (strcmpi (args, "delimiter"))) @@ -661,3 +662,7 @@ %! unlink (f); %! assert (msg1, lasterr); +%% Bug #41824 +%!test +%! assert (textscan ("123", "", "whitespace", " "){:}, 123); +