SF.net SVN: openvrml:[3501] trunk

[<br...@us...>]

Revision: 3501
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3501&view=rev
Author:   braden
Date:     2008-08-12 10:29:15 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Use G_DEFINE_TYPE for custom GTK+ widgets.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-player/filechooserdialog.cpp
    trunk/src/openvrml-xembed/gtkvrmlbrowser.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-12 10:15:26 UTC (rev 3500)
+++ trunk/ChangeLog	2008-08-12 10:29:15 UTC (rev 3501)
@@ -1,3 +1,10 @@
+2008-08-12 Braden McDaniel  <br...@en...>
+
+	Use G_DEFINE_TYPE for custom GTK+ widgets.
+
+	* src/openvrml-xembed/gtkvrmlbrowser.cpp
+	* src/openvrml-player/filechooserdialog.cpp
+
 2008-08-03 Braden McDaniel  <br...@en...>
 
 	* tests/Makefile.am: Only compile Java test programs if Script

Modified: trunk/src/openvrml-player/filechooserdialog.cpp
===================================================================
--- trunk/src/openvrml-player/filechooserdialog.cpp	2008-08-12 10:15:26 UTC (rev 3500)
+++ trunk/src/openvrml-player/filechooserdialog.cpp	2008-08-12 10:29:15 UTC (rev 3501)
@@ -24,8 +24,8 @@
 using namespace boost::multi_index::detail; // for scope_guard
 
 G_DEFINE_TYPE(OpenvrmlPlayerFileChooserDialog,
-                        openvrml_player_file_chooser_dialog,
-                        GTK_TYPE_FILE_CHOOSER_DIALOG)
+              openvrml_player_file_chooser_dialog,
+              GTK_TYPE_FILE_CHOOSER_DIALOG)
 
 namespace {
 

Modified: trunk/src/openvrml-xembed/gtkvrmlbrowser.cpp
===================================================================
--- trunk/src/openvrml-xembed/gtkvrmlbrowser.cpp	2008-08-12 10:15:26 UTC (rev 3500)
+++ trunk/src/openvrml-xembed/gtkvrmlbrowser.cpp	2008-08-12 10:29:15 UTC (rev 3501)
@@ -34,10 +34,11 @@
 
 using namespace boost::multi_index::detail; // for scope_guard
 
-extern "C" {
-    void gtk_vrml_browser_class_init(GtkVrmlBrowserClass * klass);
-    void gtk_vrml_browser_init(GtkVrmlBrowser * vrml_browser);
+G_DEFINE_TYPE(GtkVrmlBrowser,
+              gtk_vrml_browser,
+              GTK_TYPE_VRML_BROWSER)
 
+extern "C" {
     G_GNUC_INTERNAL gboolean gtk_vrml_browser_destroy(GtkWidget * widget,
                                                       GdkEvent * event,
                                                       gpointer data);
@@ -72,32 +73,6 @@
     G_GNUC_INTERNAL gint gtk_vrml_browser_timeout_callback(gpointer ptr);
 }
 
-GType gtk_vrml_browser_get_type()
-{
-    static GType type = 0;
-
-    if (!type) {
-        static const GTypeInfo info = {
-            sizeof (GtkVrmlBrowserClass),
-            0, // base_init
-            0, // base_finalize
-            reinterpret_cast<GClassInitFunc>(gtk_vrml_browser_class_init),
-            0, // class_finalize
-            0, // class_data
-            sizeof (GtkVrmlBrowser),
-            0, // n_preallocs
-            reinterpret_cast<GInstanceInitFunc>(gtk_vrml_browser_init),
-            0  // value_table
-        };
-
-        type = g_type_register_static(GTK_TYPE_DRAWING_AREA,
-                                      "GtkVrmlBrowser",
-                                      &info,
-                                      GTypeFlags(0));
-    }
-    return type;
-}
-
 namespace {
     G_GNUC_INTERNAL GdkGLConfig * gl_config;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.