changeset 12507:41d183070c04

revert changes from 2011-02-26
author Konstantinos Poulios <logari81@googlemail.com>
date Sun, 13 Mar 2011 18:26:04 +0100
parents 0dda50ae4997
children 919cadf334f8
files src/ChangeLog src/DLD-FUNCTIONS/__init_fltk__.cc
diffstat 2 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-13  Konstantinos Poulios  <logari81@googlemail.com>
+
+	* DLD-FUNCTIONS/__init_fltk__.cc (plot_window::plot_window):
+	Revert changes from 2011-02-26.
+
 2011-03-10  Konstantinos Poulios  <logari81@googlemail.com>
 
 	* graphics.h.in: Add PERSISTENT mode to listener_mode.
@@ -97,7 +102,7 @@
 
 	Bug #32319.
 
-	* __init_fltk__.cc: Include sysdep.h.
+	* DLD-FUNCTIONS/__init_fltk__.cc: Include sysdep.h.
 	(class OpenGL_fltk): Replace integer print_fid member with
 	boolean print_mode. New class member print_cmd of type string.
 	(OpenGL_fltk::print): Accept command string argument instead of
--- a/src/DLD-FUNCTIONS/__init_fltk__.cc
+++ b/src/DLD-FUNCTIONS/__init_fltk__.cc
@@ -720,6 +720,17 @@
       status->textfont (FL_COURIER);
       status->textsize (10);
       status->box (FL_ENGRAVED_BOX);
+
+      // This allows us to have a valid OpenGL context right away.
+      canvas->mode (FL_DEPTH | FL_DOUBLE );
+      if (fp.is_visible ())
+        {
+          show ();
+          if (fp.get_currentaxes ().ok())
+            show_canvas ();
+          else
+            hide_canvas ();
+        }
     }
     end ();
 
@@ -737,21 +748,6 @@
       show_menubar ();
     else
       hide_menubar ();
-
-    begin ();
-    {
-      // This allows us to have a valid OpenGL context right away.
-      canvas->mode (FL_DEPTH | FL_DOUBLE );
-      if (fp.is_visible ())
-        {
-          show ();
-          if (fp.get_currentaxes ().ok())
-            show_canvas ();
-          else
-            hide_canvas ();
-        }
-    }
-    end ();
   }
 
   ~plot_window (void)