# HG changeset patch
# User Kai Habel <kai.habel@gmx.de>
# Date 1291229747 -3600
# Node ID 5d1877a86180736afd74247b76f7449f3bd53a23
# Parent  e971caa4c2bb38e9c2819f30d7cafc3bb1aed865
Fix gui mode

diff --git a/src/ChangeLog b/src/ChangeLog
--- 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, 
diff --git a/src/DLD-FUNCTIONS/fltk_backend.cc b/src/DLD-FUNCTIONS/fltk_backend.cc
--- 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;