Mercurial > hg > octave-max

changeset 11303:5d1877a86180

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix gui mode
author Kai Habel <kai.habel@gmx.de>
date Wed, 01 Dec 2010 19:55:47 +0100
parents e971caa4c2bb
children c9fefa096ce2
files src/ChangeLog src/DLD-FUNCTIONS/fltk_backend.cc
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-01  Kai Habel  <kai.habel@gmx.de>
+
+	* DLD-FUNCTIONS/fltk_backend.cc (fltk_gui_mode): Fix gui mode
+	problems when set to none.
+
 2010-11-26  Kai Habel  <kai.habel@gmx.de>
 
 	* DLD-FUNCTIONS/fltk_backend.cc (find_uimenu_children, 
--- a/src/DLD-FUNCTIONS/fltk_backend.cc
+++ b/src/DLD-FUNCTIONS/fltk_backend.cc
@@ -705,9 +705,9 @@
       if (fp.is_visible ())
         {
           show ();
-	  if (fp.get_currentaxes ().ok())
-	    show_canvas ();
-	  else
+          if (fp.get_currentaxes ().ok())
+            show_canvas ();
+          else
             hide_canvas ();
         }
     }
@@ -855,7 +855,7 @@
 
     if (ndim == 3)
       rotate->activate ();
-    else
+    else if ((ndim == 2) &&  (gui_mode == rotate_zoom))
       {
         rotate->deactivate ();
         gui_mode = pan_zoom;