Mercurial > octave-nkf
changeset 19694:40e846a96908
graphics_toolkit.m: Return a valid toolkit, not "", before any plotting has happened (bug #41665).
* graphics_toolkit.m: Check return value of graphics_toolkit. If empty, look
for 'qt', then 'fltk', then any available plotting engine.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 04 Feb 2015 17:54:58 -0800 |
| parents | a9516bc4c55c |
| children | c728ae4d1790 |
| files | scripts/plot/util/graphics_toolkit.m |
| diffstat | 1 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/graphics_toolkit.m Thu Feb 05 23:12:47 2015 +0100 +++ b/scripts/plot/util/graphics_toolkit.m Wed Feb 04 17:54:58 2015 -0800 @@ -44,6 +44,17 @@ if (nargout > 0 || nargin == 0) retval = get (0, "defaultfigure__graphics_toolkit__"); + ## Handle case where graphics_toolkit has been called before any plotting + if (isempty (retval)) + toolkits = available_graphics_toolkits (); + if (any (strcmp ("qt", toolkits))) + retval = "qt"; + elseif (any (strcmp ("fltk", toolkits))) + retval = "fltk"; + elseif (! isempty (toolkits)) + retval = toolkits{1}; + endif + endif endif if (nargin == 0)