# HG changeset patch # User Ben Abbott # Date 1323887963 18000 # Node ID c3fab389146039035d0f36950cdc801b112f8a04 # Parent db264e617a98b3c64d93f52ce44361e6683b83a7 Trivial bug fixes for graphics_toolkit(). * graphics_toolkit.m: Do not return output when used as a command. Respect documented syntax: OLD_NAME = graphics_toolkit (NAME). Add tests. diff --git a/scripts/plot/graphics_toolkit.m b/scripts/plot/graphics_toolkit.m --- a/scripts/plot/graphics_toolkit.m +++ b/scripts/plot/graphics_toolkit.m @@ -35,8 +35,11 @@ print_usage (); endif + if (nargout > 0 || nargin == 0) + retval = get (0, "defaultfigure__graphics_toolkit__"); + endif + if (nargin == 0) - retval = get (0, "defaultfigure__graphics_toolkit__"); return; elseif (nargin == 1) if (! ischar (name)) @@ -65,10 +68,6 @@ set (hlist, "__graphics_toolkit__", name); endif - if (isargout (1)) - retval = name; - endif - endfunction @@ -83,3 +82,14 @@ %! close (hf); %! end_unwind_protect +%!testif HAVE_FLTK +%! old_toolkit = graphics_toolkit (); +%! switch old_toolkit +%! case {"gnuplot"} +%! new_toolkit = "fltk"; +%! otherwise +%! new_toolkit = "gnuplot"; +%! endswitch +%! assert (graphics_toolkit (new_toolkit), old_toolkit) +%! assert (graphics_toolkit (old_toolkit), new_toolkit) +