Mercurial > octave

diff scripts/gui/uimenu.m @ 21511:e1c5aca1c798

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix failing tests when building with --without-opengl * graphics.cc, __osmesa_print__.cc, uimenu.m, allchild.m, findall.m, graphics_toolkit.m: Fix failing BIST tests when building with --without-opengl by adding HAVE_OPENGL to the test preconditions.
author Mike Miller <mtmiller@octave.org>
date Mon, 21 Mar 2016 15:01:12 -0700
parents 516bb87ea72e
children bac0d6f07a3e
line wrap: on
line diff
--- a/scripts/gui/uimenu.m	Sun Mar 20 21:39:49 2016 +0000
+++ b/scripts/gui/uimenu.m	Mon Mar 21 15:01:12 2016 -0700
@@ -103,7 +103,7 @@
 %! uimenu (f, 'label', 'Close', 'accelerator', 'q', 'callback', 'close (gcf)');
 %! uimenu (e, 'label', 'Toggle &Grid', 'accelerator', 'g', 'callback', 'grid (gca)');
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect
@@ -120,7 +120,7 @@
 %! end_unwind_protect
 
 ## check for top level menus file and edit
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect
@@ -133,7 +133,7 @@
 %!   graphics_toolkit (toolkit);
 %! end_unwind_protect
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect