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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/28 14:34:58

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 

Log message:
                * gui/gtk.cpp: reintroduced ifdef hell in a struggle to
                  have a renderer registered in Gui::init.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.948&r2=1.949
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.948
retrieving revision 1.949
diff -u -b -r1.948 -r1.949
--- ChangeLog   28 Sep 2006 09:41:27 -0000      1.948
+++ ChangeLog   28 Sep 2006 14:34:58 -0000      1.949
@@ -1,5 +1,7 @@
 2006-09-28 Sandro Santilli  <address@hidden>
 
+       * gui/gtk.cpp: reintroduced ifdef hell in a struggle to 
+         have a renderer registered in Gui::init.
        * gui/sdl.cpp: fixed compiler warnings.
        * gui/gtk.cpp, gui/sdl.cpp: moved render handler creation
          from createWindow() to init().

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gui/gtk.cpp 28 Sep 2006 08:20:31 -0000      1.24
+++ gui/gtk.cpp 28 Sep 2006 14:34:58 -0000      1.25
@@ -79,11 +79,49 @@
 
     glue.init (argc, argv);
 
+    add_pixmap_directory (PKGDATADIR);
+
+    if (_xid) {
+      _window = gtk_plug_new(_xid);
+      dbglogfile << "Created XEmbedded window" << endl;
+    } else {
+      _window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      dbglogfile << "Created top level window" << endl;
+    }
+
+    // XXXbjacques: why do we need this?
+    gtk_container_set_reallocate_redraws(GTK_CONTAINER (_window), TRUE);
+
+    _window_icon_pixbuf = create_pixbuf ("gnash_128_96.ico");
+    if (_window_icon_pixbuf) {
+        gtk_window_set_icon (GTK_WINDOW (_window), _window_icon_pixbuf);
+       gdk_pixbuf_unref (_window_icon_pixbuf);
+    }
+    _drawing_area = gtk_drawing_area_new();
+
+    createMenu();
+    setupEvents();
+
+#ifdef RENDERER_OPENGL
+    // opengl glue needs to be  "prepared" before
+    // widgets are realized (??)
+    glue.prepDrawingArea(_drawing_area);
+#endif
+
+    gtk_widget_realize(_window);
+    gtk_container_add(GTK_CONTAINER(_window), _drawing_area);
+    gtk_widget_show(_drawing_area);
+    gtk_widget_show(_window);
+
+#ifdef RENDERER_CAIRO
+    /// cairo needs the _drawing_area.window to prepare it ..
+    glue.prepDrawingArea(_drawing_area);
+#endif
+
+
     _renderer = glue.createRenderHandler();
     set_render_handler(_renderer);
     
-    add_pixmap_directory (PKGDATADIR);
-
     return true;
 }
 
@@ -97,6 +135,10 @@
     bool ret = createWindow(width, height);
     gtk_window_set_title(GTK_WINDOW(_window), title);
 
+    if (!_xid) {
+      gtk_widget_set_size_request(_drawing_area, width, height);
+    }
+
     return ret;
 }
 
@@ -165,43 +207,9 @@
 GtkGui::createWindow(int width, int height)
 {
     GNASH_REPORT_FUNCTION;
-
-    if (_xid) {
-      _window = gtk_plug_new(_xid);
-      dbglogfile << "Created XEmbedded window" << endl;
-    } else {
-      _window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      dbglogfile << "Created top level window" << endl;
-    }
-
-    // XXXbjacques: why do we need this?
-    gtk_container_set_reallocate_redraws(GTK_CONTAINER (_window), TRUE);
-
-    _window_icon_pixbuf = create_pixbuf ("gnash_128_96.ico");
-    if (_window_icon_pixbuf) {
-        gtk_window_set_icon (GTK_WINDOW (_window), _window_icon_pixbuf);
-       gdk_pixbuf_unref (_window_icon_pixbuf);
-    }
-    _drawing_area = gtk_drawing_area_new();
-
-    if (!_xid) {
-      gtk_widget_set_size_request(_drawing_area, width, height);
-    }
-
-    createMenu();
-    setupEvents();
-
     _width = width;
     _height = height;
 
-    gtk_widget_realize(_window);
-    gtk_container_add(GTK_CONTAINER(_window), _drawing_area);
-    gtk_widget_show(_drawing_area);
-    gtk_widget_show(_window);
-
-    /// cairo needs the _drawing_area.window to prepare it ..
-    glue.prepDrawingArea(_drawing_area);
-
     return true;
 }