[Gnash-commit] gnash ChangeLog gui/gtk.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/10/01 20:21:57

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 

Log message:
        Fix gtkgl assertion by making sure that the configure
        event isn't fired before the drawing area is OpenGL-initialised.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.977&r2=1.978
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.977
retrieving revision 1.978
diff -u -b -r1.977 -r1.978
--- ChangeLog   1 Oct 2006 09:12:53 -0000       1.977
+++ ChangeLog   1 Oct 2006 20:21:57 -0000       1.978
@@ -1,3 +1,8 @@
+2006-10-01 Bastiaan Jacques <address@hidden>
+
+       * gui/gtk.cpp: Fix gtkgl assertion by making sure that the configure
+       event isn't fired before the drawing area is OpenGL-initialised.
+
 2006-10-01 Sandro Santilli  <address@hidden>
 
        * server/builtin_function.h: doxygen dox.

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gui/gtk.cpp 28 Sep 2006 14:34:58 -0000      1.25
+++ gui/gtk.cpp 1 Oct 2006 20:21:57 -0000       1.26
@@ -100,13 +100,12 @@
     _drawing_area = gtk_drawing_area_new();
 
     createMenu();
-    setupEvents();
-
 #ifdef RENDERER_OPENGL
-    // opengl glue needs to be  "prepared" before
-    // widgets are realized (??)
+    // OpenGL glue needs to prepare the drawing area for OpenGL rendering 
before
+    // widgets are realized and before the configure event is fired.
     glue.prepDrawingArea(_drawing_area);
 #endif
+    setupEvents();
 
     gtk_widget_realize(_window);
     gtk_container_add(GTK_CONTAINER(_window), _drawing_area);
@@ -114,7 +113,7 @@
     gtk_widget_show(_window);
 
 #ifdef RENDERER_CAIRO
-    /// cairo needs the _drawing_area.window to prepare it ..
+    // cairo needs the _drawing_area.window to prepare it ..
     glue.prepDrawingArea(_drawing_area);
 #endif