gtk-engines r1284 - in trunk: . engines/crux/src engines/glide/src engines/hc/src engines/industrial engines/industrial/src engines/lua/src engines/mist/src engines/redmond/src engines/thinice/src



Author: bberg
Date: Sun Nov 30 20:26:01 2008
New Revision: 1284
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1284&view=rev

Log:
2008-11-30  Benjamin Berg  <benjamin sipsolutions net>

	* engines/*:
	Use G_DEFINE_DYNAMIC_TYPE everywhere. Bug #549830.


Removed:
   trunk/engines/industrial/src/industrial_style_versioned_code.h
Modified:
   trunk/ChangeLog
   trunk/engines/crux/src/crux-main.c
   trunk/engines/crux/src/crux-rc-style.c
   trunk/engines/crux/src/crux-rc-style.h
   trunk/engines/crux/src/crux-style.c
   trunk/engines/crux/src/crux-style.h
   trunk/engines/glide/src/glide_gtk2_drawing.c
   trunk/engines/glide/src/glide_gtk2_engine.c
   trunk/engines/glide/src/glide_gtk2_engine.h
   trunk/engines/hc/src/hc-style.c
   trunk/engines/hc/src/hc_gtk2_engine.c
   trunk/engines/hc/src/hc_gtk2_engine.h
   trunk/engines/industrial/Makefile.am
   trunk/engines/industrial/src/industrial_rc_style.c
   trunk/engines/industrial/src/industrial_rc_style.h
   trunk/engines/industrial/src/industrial_style.c
   trunk/engines/industrial/src/industrial_style.h
   trunk/engines/industrial/src/industrial_theme_main.c
   trunk/engines/lua/src/lua_rc_style.c
   trunk/engines/lua/src/lua_rc_style.h
   trunk/engines/lua/src/lua_style.c
   trunk/engines/lua/src/lua_style.h
   trunk/engines/lua/src/main.c
   trunk/engines/mist/src/mist-rc-style.c
   trunk/engines/mist/src/mist-rc-style.h
   trunk/engines/mist/src/mist-style.c
   trunk/engines/mist/src/mist-style.h
   trunk/engines/mist/src/mist.c
   trunk/engines/redmond/src/redmond_gtk2_engine.c
   trunk/engines/redmond/src/redmond_gtk2_engine.h
   trunk/engines/thinice/src/thinice_main.c
   trunk/engines/thinice/src/thinice_rc_style.c
   trunk/engines/thinice/src/thinice_rc_style.h
   trunk/engines/thinice/src/thinice_style.h
   trunk/engines/thinice/src/thinice_theme_draw.c

Modified: trunk/engines/crux/src/crux-main.c
==============================================================================
--- trunk/engines/crux/src/crux-main.c	(original)
+++ trunk/engines/crux/src/crux-main.c	Sun Nov 30 20:26:01 2008
@@ -12,8 +12,8 @@
 GE_EXPORT void
 theme_init (GTypeModule *module)
 {
-  crux_rc_style_register_type (module);
-  crux_style_register_type (module);
+  crux_rc_style_register_types (module);
+  crux_style_register_types (module);
 }
 
 GE_EXPORT void

Modified: trunk/engines/crux/src/crux-rc-style.c
==============================================================================
--- trunk/engines/crux/src/crux-rc-style.c	(original)
+++ trunk/engines/crux/src/crux-rc-style.c	Sun Nov 30 20:26:01 2008
@@ -6,10 +6,17 @@
 #include <stdio.h>
 #include <string.h>
 
-GType crux_type_rc_style = 0;
 
 static GtkStyle *crux_rc_style_create_style (GtkRcStyle *rc_style);
 
+G_DEFINE_DYNAMIC_TYPE (CruxRcStyle, crux_rc_style, GTK_TYPE_RC_STYLE)
+
+void
+crux_rc_style_register_types (GTypeModule *module)
+{
+	crux_rc_style_register_type (module);
+}
+
 static void
 crux_rc_style_class_init (CruxRcStyleClass *klass)
 {
@@ -17,30 +24,19 @@
 	rc_style_class->create_style = crux_rc_style_create_style;
 }
 
-void
-crux_rc_style_register_type (GTypeModule *module)
+static GtkStyle *
+crux_rc_style_create_style (GtkRcStyle *rc_style)
 {
-  static const GTypeInfo object_info =
-  {
-    sizeof (CruxRcStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) crux_rc_style_class_init,
-    NULL,           /* class_finalize */
-    NULL,           /* class_data */
-    sizeof (CruxRcStyle),
-    0,              /* n_preallocs */
-    (GInstanceInitFunc) NULL,
-  };
-
-  crux_type_rc_style = g_type_module_register_type (module,
-                                                      GTK_TYPE_RC_STYLE,
-                                                      "CruxRcStyle",
-                                                      &object_info, 0);
+	return GTK_STYLE (g_object_new (CRUX_TYPE_STYLE, NULL));
 }
 
-static GtkStyle *
-crux_rc_style_create_style (GtkRcStyle *rc_style)
+static void
+crux_rc_style_init (CruxRcStyle *rc_style)
+{
+}
+
+static void
+crux_rc_style_class_finalize (CruxRcStyleClass *klass)
 {
-  return GTK_STYLE (g_object_new (CRUX_TYPE_STYLE, NULL));
 }
+

Modified: trunk/engines/crux/src/crux-rc-style.h
==============================================================================
--- trunk/engines/crux/src/crux-rc-style.h	(original)
+++ trunk/engines/crux/src/crux-rc-style.h	Sun Nov 30 20:26:01 2008
@@ -6,9 +6,7 @@
 
 G_BEGIN_DECLS
 
-GE_INTERNAL extern GType crux_type_rc_style;
-
-#define CRUX_TYPE_RC_STYLE              crux_type_rc_style
+#define CRUX_TYPE_RC_STYLE              (crux_rc_style_get_type ())
 #define CRUX_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), CRUX_TYPE_RC_STYLE, CruxRcStyle))
 #define CRUX_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), CRUX_TYPE_RC_STYLE, CruxRcStyleClass))
 #define CRUX_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), CRUX_TYPE_RC_STYLE))
@@ -28,8 +26,8 @@
   GtkRcStyleClass parent_class;
 };
 
-GE_INTERNAL void crux_rc_style_register_type (GTypeModule *engine);
-
+GE_INTERNAL void  crux_rc_style_register_types (GTypeModule *engine);
+GE_INTERNAL GType crux_rc_style_get_type       (void);
 
 G_END_DECLS
 

Modified: trunk/engines/crux/src/crux-style.c
==============================================================================
--- trunk/engines/crux/src/crux-style.c	(original)
+++ trunk/engines/crux/src/crux-style.c	Sun Nov 30 20:26:01 2008
@@ -4,30 +4,12 @@
 #include <gtk/gtk.h>
 #include <stdio.h>
 
-GType crux_type_style = 0;
-
-static void crux_style_class_init (CruxStyleClass *klass);
+G_DEFINE_DYNAMIC_TYPE (CruxStyle, crux_style, GTK_TYPE_STYLE)
 
 void
-crux_style_register_type (GTypeModule *module)
+crux_style_register_types (GTypeModule *module)
 {
-  static const GTypeInfo object_info =
-  {
-    sizeof (CruxStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) crux_style_class_init,
-    NULL,           /* class_finalize */
-    NULL,           /* class_data */
-    sizeof (CruxStyle),
-    0,              /* n_preallocs */
-    (GInstanceInitFunc) NULL,
-  };
-
-  crux_type_style = g_type_module_register_type (module,
-						 GTK_TYPE_STYLE,
-						 "CruxStyle",
-						 &object_info, 0);
+	crux_style_register_type (module);
 }
 
 static void
@@ -36,5 +18,14 @@
   GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
   crux_draw_style_class_init (style_class);
 }
-    
+
+static void
+crux_style_init (CruxStyle *style)
+{
+}
+
+static void
+crux_style_class_finalize (CruxStyleClass *klass)
+{
+}
 

Modified: trunk/engines/crux/src/crux-style.h
==============================================================================
--- trunk/engines/crux/src/crux-style.h	(original)
+++ trunk/engines/crux/src/crux-style.h	Sun Nov 30 20:26:01 2008
@@ -10,7 +10,7 @@
 
 GE_INTERNAL extern GType crux_type_style;
 
-#define CRUX_TYPE_STYLE              crux_type_style
+#define CRUX_TYPE_STYLE              (crux_style_get_type ())
 #define CRUX_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), CRUX_TYPE_STYLE, CruxStyle))
 #define CRUX_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), CRUX_TYPE_STYLE, CruxStyleClass))
 #define CRUX_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), CRUX_TYPE_STYLE))
@@ -31,7 +31,8 @@
 
 };
 
-GE_INTERNAL void crux_style_register_type (GTypeModule *module);
+GE_INTERNAL void  crux_style_register_types (GTypeModule *module);
+GE_INTERNAL GType crux_style_get_type       (void);
 
 G_END_DECLS
 

Modified: trunk/engines/glide/src/glide_gtk2_drawing.c
==============================================================================
--- trunk/engines/glide/src/glide_gtk2_drawing.c	(original)
+++ trunk/engines/glide/src/glide_gtk2_drawing.c	Sun Nov 30 20:26:01 2008
@@ -1535,8 +1535,12 @@
 		cairo_destroy(canvas);
 	}
 	else
+	{
+		GtkStyleClass *glide_parent_class;
+		glide_parent_class = GTK_STYLE_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS(style)));
 		glide_parent_class->draw_flat_box (style, window, state_type, shadow_type, area,
 							widget, detail, x, y, width, height);
+	}
 }
 
 /***********************************************
@@ -2210,6 +2214,8 @@
 
 	if (interior_focus)
 	{
+		GtkStyleClass *glide_parent_class;
+		glide_parent_class = GTK_STYLE_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS(style)));
 		glide_parent_class->draw_focus(style, window, state_type, area, widget, detail, x, y, width, height);
 	}
 	else

Modified: trunk/engines/glide/src/glide_gtk2_engine.c
==============================================================================
--- trunk/engines/glide/src/glide_gtk2_engine.c	(original)
+++ trunk/engines/glide/src/glide_gtk2_engine.c	Sun Nov 30 20:26:01 2008
@@ -43,7 +43,6 @@
 /**********************************/ 
 /* Register & Initialize RC Style */ 
 /**********************************/ 
-GType glide_type_rc_style = 0;
  
 /* Create an empty style suitable to this RC style */ 
 static GtkStyle *
@@ -60,32 +59,23 @@
   rc_style_class->create_style = glide_rc_style_create_style;
 }
  
+G_DEFINE_DYNAMIC_TYPE (GlideRcStyle, glide_rc_style, GTK_TYPE_RC_STYLE)
+
 static void
-glide_rc_style_register_type (GTypeModule * module)
+glide_rc_style_class_finalize (GlideRcStyleClass *klass)
 {
-  static const GTypeInfo object_info = {
-    sizeof (GlideRcStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) glide_rc_style_class_init,
-    NULL,			/* class_finalize */
-    NULL,			/* class_data */
-    sizeof (GlideRcStyle),
-    0,				/* n_preallocs */
-    (GInstanceInitFunc) NULL,
-  };
- 
-  glide_type_rc_style = g_type_module_register_type (module,
-						       GTK_TYPE_RC_STYLE,
-						       "GlideRcStyle",
-						       &object_info, 0);
 }
- 
+
+static void
+glide_rc_style_init (GlideRcStyle *self)
+{
+}
+
 /***************************************/ 
 /* Register & Initialize Drawing Style */ 
 /***************************************/ 
-GType glide_type_style = 0;
-GtkStyleClass *glide_parent_class;
+
+G_DEFINE_DYNAMIC_TYPE (GlideStyle, glide_style, GTK_TYPE_STYLE)
 
 static void
 glide_linear_overlay_pattern(gboolean vertical, gboolean EVIL_OVERLAY, CairoPattern *pattern)
@@ -139,7 +129,7 @@
 	GlideStyle *glide_style = GLIDE_STYLE (style);
 	int i;
  
-	glide_parent_class->realize (style);
+	GTK_STYLE_CLASS (glide_style_parent_class)->realize (style);
  
 	ge_gtk_style_to_cairo_color_cube (style, &glide_style->color_cube);
 
@@ -202,7 +192,7 @@
 		ge_cairo_pattern_destroy(glide_style->active_tab_gradient[GTK_POS_BOTTOM][i]);
 	}
  
-	glide_parent_class->unrealize (style);
+	GTK_STYLE_CLASS (glide_style_parent_class)->unrealize (style);
 }
  
 static void
@@ -210,8 +200,6 @@
 {
   GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
  
-  glide_parent_class = g_type_class_peek_parent (klass);
- 
   style_class->realize = glide_style_realize;
   style_class->unrealize = glide_style_unrealize;
  
@@ -234,26 +222,15 @@
 }
   
 static void
-glide_style_register_type (GTypeModule * module)
+glide_style_class_finalize (GlideStyleClass *klass)
 {
-  static const GTypeInfo object_info = {
-    sizeof (GlideStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) glide_style_class_init,
-    NULL,			/* class_finalize */
-    NULL,			/* class_data */
-    sizeof (GlideStyle),
-    0,				/* n_preallocs */
-    (GInstanceInitFunc) NULL,
-  };
- 
-  glide_type_style = g_type_module_register_type (module,
-						    GTK_TYPE_STYLE,
-						    "GlideStyle",
-						    &object_info, 0);
 }
- 
+
+static void
+glide_style_init (GlideStyle *self)
+{
+}
+
 /****************/ 
 /* Engine Hooks */ 
 /****************/ 

Modified: trunk/engines/glide/src/glide_gtk2_engine.h
==============================================================================
--- trunk/engines/glide/src/glide_gtk2_engine.h	(original)
+++ trunk/engines/glide/src/glide_gtk2_engine.h	Sun Nov 30 20:26:01 2008
@@ -32,9 +32,8 @@
 /*****************************/
 /* RC Style Declaration      */
 /*****************************/
-GE_INTERNAL extern GType glide_type_rc_style;
  
-#define GLIDE_TYPE_RC_STYLE              glide_type_rc_style
+#define GLIDE_TYPE_RC_STYLE              (glide_rc_style_get_type ())
 #define GLIDE_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GLIDE_TYPE_RC_STYLE, GlideRcStyle))
 #define GLIDE_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GLIDE_TYPE_RC_STYLE, GlideRcStyleClass))
 #define GLIDE_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GLIDE_TYPE_RC_STYLE))
@@ -50,14 +49,14 @@
 {
   GtkRcStyleClass parent_class;
 } GlideRcStyleClass;
+
+GE_INTERNAL GType glide_rc_style_get_type (void);
  
 /*****************************/
 /* Drawing Style Declaration */
 /*****************************/
-GE_INTERNAL extern GType glide_type_style;
-GE_INTERNAL extern GtkStyleClass *glide_parent_class;
  
-#define GLIDE_TYPE_STYLE              glide_type_style
+#define GLIDE_TYPE_STYLE              (glide_style_get_type ())
 #define GLIDE_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GLIDE_TYPE_STYLE, GlideStyle))
 #define GLIDE_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GLIDE_TYPE_STYLE, GlideStyleClass))
 #define GLIDE_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GLIDE_TYPE_STYLE))
@@ -82,3 +81,7 @@
 {
   GtkStyleClass parent_class;
 } GlideStyleClass;
+
+GE_INTERNAL GType glide_style_get_type (void);
+
+

Modified: trunk/engines/hc/src/hc-style.c
==============================================================================
--- trunk/engines/hc/src/hc-style.c	(original)
+++ trunk/engines/hc/src/hc-style.c	Sun Nov 30 20:26:01 2008
@@ -379,11 +379,17 @@
                   gint		 height)
 {
 	if (detail && !strcmp ("tooltip", detail))
+	{
 		hc_draw_box (style, window, state_type, shadow_type, area,
 				widget, detail, x, y, width, height);
+	}
 	else
+	{
+		GtkStyleClass *hc_parent_class;
+		hc_parent_class = GTK_STYLE_CLASS (g_type_class_peek_parent (G_OBJECT_GET_CLASS(style)));
 		hc_parent_class->draw_flat_box (style, window, state_type, shadow_type, area,
 							widget, detail, x, y, width, height);
+	}
 }
 
 

Modified: trunk/engines/hc/src/hc_gtk2_engine.c
==============================================================================
--- trunk/engines/hc/src/hc_gtk2_engine.c	(original)
+++ trunk/engines/hc/src/hc_gtk2_engine.c	Sun Nov 30 20:26:01 2008
@@ -152,8 +152,9 @@
 /**********************************/ 
 /* Register & Initialize RC Style */ 
 /**********************************/ 
-GType hc_type_rc_style = 0;
-static GtkRcStyleClass *hc_parent_rc_class = NULL;
+
+
+G_DEFINE_DYNAMIC_TYPE (HcRcStyle, hc_rc_style, GTK_TYPE_RC_STYLE)
 
 /* Create an empty style suitable to this RC style */ 
 static GtkStyle *
@@ -169,7 +170,7 @@
 	HcRcFlags flags;
 	HcRcStyle *dest_w, *src_w;
 
-	hc_parent_rc_class->merge (dest, src);
+	GTK_RC_STYLE_CLASS (hc_rc_style_parent_class)->merge (dest, src);
 
 	if (!HC_IS_RC_STYLE (src))
 		return;
@@ -187,13 +188,10 @@
 	dest_w->flags = dest_w->flags | src_w->flags;
 }
 
-
 static void hc_rc_style_class_init (HcRcStyleClass *klass)
 {
   GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
 
-  hc_parent_rc_class = g_type_class_peek_parent (klass);
-
   rc_style_class->create_style = hc_rc_style_create_style;
   rc_style_class->parse = hc_rc_style_parse;
   rc_style_class->merge = hc_rc_style_merge;
@@ -207,32 +205,16 @@
 	hc_rc_style->cell_indicator_size = -1;
 }
 
-static void hc_rc_style_register_type (GTypeModule *module)
+static void
+hc_rc_style_class_finalize (HcRcStyleClass *klass)
 {
-  static const GTypeInfo object_info =
-  {
-    sizeof (HcRcStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) hc_rc_style_class_init,
-    NULL,           /* class_finalize */
-    NULL,           /* class_data */
-    sizeof (HcRcStyle),
-    0,              /* n_preallocs */
-    (GInstanceInitFunc) hc_rc_style_init,
-  };
-  
-  hc_type_rc_style = g_type_module_register_type (module,
-							      GTK_TYPE_RC_STYLE,
-							      "HcRcStyle",
-							      &object_info, 0);
 }
 
 /***************************************/ 
 /* Register & Initialize Drawing Style */ 
 /***************************************/ 
-GtkStyleClass *hc_parent_class = NULL;
 
+G_DEFINE_DYNAMIC_TYPE (HcStyle, hc_style, GTK_TYPE_STYLE)
 
 static void
 hc_style_realize (GtkStyle *style)
@@ -345,7 +327,7 @@
 	hc_style->edge_thickness = hc_src->edge_thickness;
 	hc_style->cell_indicator_size = hc_src->cell_indicator_size;
 
-	hc_parent_class->copy (style, src);
+	GTK_STYLE_CLASS (hc_style_parent_class)->copy (style, src);
 }
 
 static void
@@ -353,7 +335,7 @@
 {
 	HcStyle *hc_style = HC_STYLE (style);
 
-	hc_parent_class->init_from_rc (style, rc_style);
+	GTK_STYLE_CLASS (hc_style_parent_class)->init_from_rc (style, rc_style);
 
 	if (HC_RC_STYLE (rc_style)->edge_thickness > 0)
 	{
@@ -371,8 +353,6 @@
 {
   GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
 
-  hc_parent_class = g_type_class_peek_parent (klass);
- 
   style_class->realize = hc_style_realize;
   style_class->copy = hc_style_copy;
   style_class->init_from_rc = hc_style_init_from_rc;
@@ -405,28 +385,9 @@
 	style->cell_indicator_size = 12;
 }
 
-GType hc_type_style = 0;
-
 static void
-hc_style_register_type (GTypeModule *module)
+hc_style_class_finalize (HcStyleClass *klass)
 {
-  static const GTypeInfo object_info =
-  {
-    sizeof (HcStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) hc_style_class_init,
-    NULL,           /* class_finalize */
-    NULL,           /* class_data */
-    sizeof (HcStyle),
-    0,              /* n_preallocs */
-    (GInstanceInitFunc) hc_style_init,
-  };
-  
-  hc_type_style = g_type_module_register_type (module,
-							   GTK_TYPE_STYLE,
-							   "HcStyle",
-							   &object_info, 0);
 }
 
 /****************/ 

Modified: trunk/engines/hc/src/hc_gtk2_engine.h
==============================================================================
--- trunk/engines/hc/src/hc_gtk2_engine.h	(original)
+++ trunk/engines/hc/src/hc_gtk2_engine.h	Sun Nov 30 20:26:01 2008
@@ -27,10 +27,8 @@
 /*****************************/
 /* RC Style Declaration      */
 /*****************************/
-GE_INTERNAL extern GType hc_type_rc_style;
-GE_INTERNAL extern GtkStyleClass *hc_parent_class;
  
-#define HC_TYPE_RC_STYLE              hc_type_rc_style
+#define HC_TYPE_RC_STYLE              (hc_rc_style_get_type ())
 #define HC_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), HC_TYPE_RC_STYLE, HcRcStyle))
 #define HC_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), HC_TYPE_RC_STYLE, HcRcStyleClass))
 #define HC_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), HC_TYPE_RC_STYLE))
@@ -57,13 +55,14 @@
 {
   GtkRcStyleClass parent_class;
 } HcRcStyleClass;
+
+GE_INTERNAL GType hc_rc_style_get_type (void);
  
 /*****************************/
 /* Drawing Style Declaration */
 /*****************************/
-GE_INTERNAL extern GType hc_type_style;
  
-#define HC_TYPE_STYLE              hc_type_style
+#define HC_TYPE_STYLE              (hc_style_get_type ())
 #define HC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), HC_TYPE_STYLE, HcStyle))
 #define HC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), HC_TYPE_STYLE, HcStyleClass))
 #define HC_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), HC_TYPE_STYLE))
@@ -84,3 +83,6 @@
 {
   GtkStyleClass parent_class;
 } HcStyleClass;
+
+GE_INTERNAL GType hc_style_get_type (void);
+

Modified: trunk/engines/industrial/Makefile.am
==============================================================================
--- trunk/engines/industrial/Makefile.am	(original)
+++ trunk/engines/industrial/Makefile.am	Sun Nov 30 20:26:01 2008
@@ -13,7 +13,6 @@
 	./src/industrial_theme_main.c
 
 EXTRA_DIST = \
-	./src/industrial_style_versioned_code.h		\
 	./src/parse_rc_style.h				\
 	./AUTHORS
 

Modified: trunk/engines/industrial/src/industrial_rc_style.c
==============================================================================
--- trunk/engines/industrial/src/industrial_rc_style.c	(original)
+++ trunk/engines/industrial/src/industrial_rc_style.c	Sun Nov 30 20:26:01 2008
@@ -27,9 +27,13 @@
 #include "industrial_style.h"
 #include "industrial_rc_style.h"
 
-static GtkRcStyleClass *parent_class;
+G_DEFINE_DYNAMIC_TYPE (IndustrialRcStyle, industrial_rc_style, GTK_TYPE_RC_STYLE)
 
-GType industrial_type_rc_style = 0;
+void
+industrial_rc_style_register_types (GTypeModule *module)
+{
+	industrial_rc_style_register_type (module);
+}
 
 static void
 industrial_rc_style_init (IndustrialRcStyle *industrial_rc)
@@ -66,7 +70,7 @@
 	IndustrialRcStyle *dest_w, *src_w;
 	IndustrialFields fields;
 
-	parent_class->merge (dest, src);
+	GTK_RC_STYLE_CLASS (industrial_rc_style_parent_class)->merge (dest, src);
 
 	if (!INDUSTRIAL_IS_RC_STYLE (src))
 		return;
@@ -91,31 +95,13 @@
 {
 	GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
 
-	parent_class = g_type_class_peek_parent (klass);
-
 	rc_style_class->create_style = industrial_rc_style_create_style;
 	rc_style_class->parse = industrial_rc_style_parse;
 	rc_style_class->merge = industrial_rc_style_merge;
 }
 
-void
-industrial_rc_style_register_type (GTypeModule * module)
+static void
+industrial_rc_style_class_finalize (IndustrialRcStyleClass *klass)
 {
-	static const GTypeInfo object_info = {
-		sizeof (IndustrialRcStyleClass),
-		(GBaseInitFunc) NULL,
-		(GBaseFinalizeFunc) NULL,
-		(GClassInitFunc) industrial_rc_style_class_init,
-		NULL,		/* class_finalize */
-		NULL,		/* class_data */
-		sizeof (IndustrialRcStyle),
-		0,		/* n_preallocs */
-		(GInstanceInitFunc) industrial_rc_style_init,
-		NULL
-	};
-
-	industrial_type_rc_style = g_type_module_register_type (module,
-								GTK_TYPE_RC_STYLE,
-								"IndustrialRcStyle",
-								&object_info, 0);
 }
+

Modified: trunk/engines/industrial/src/industrial_rc_style.h
==============================================================================
--- trunk/engines/industrial/src/industrial_rc_style.h	(original)
+++ trunk/engines/industrial/src/industrial_rc_style.h	Sun Nov 30 20:26:01 2008
@@ -29,9 +29,7 @@
 typedef struct _IndustrialRcStyle IndustrialRcStyle;
 typedef struct _IndustrialRcStyleClass IndustrialRcStyleClass;
 
-GE_INTERNAL extern GType industrial_type_rc_style;
-
-#define INDUSTRIAL_TYPE_RC_STYLE              industrial_type_rc_style
+#define INDUSTRIAL_TYPE_RC_STYLE              (industrial_rc_style_get_type ())
 #define INDUSTRIAL_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), INDUSTRIAL_TYPE_RC_STYLE, IndustrialRcStyle))
 #define INDUSTRIAL_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), INDUSTRIAL_TYPE_RC_STYLE, IndustrialRcStyleClass))
 #define INDUSTRIAL_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), INDUSTRIAL_TYPE_RC_STYLE))
@@ -58,4 +56,6 @@
 	GtkRcStyleClass parent_class;
 };
 
-GE_INTERNAL void industrial_rc_style_register_type (GTypeModule * module);
+GE_INTERNAL void  industrial_rc_style_register_types (GTypeModule * module);
+GE_INTERNAL GType industrial_rc_style_get_type       (void);
+

Modified: trunk/engines/industrial/src/industrial_style.c
==============================================================================
--- trunk/engines/industrial/src/industrial_style.c	(original)
+++ trunk/engines/industrial/src/industrial_style.c	Sun Nov 30 20:26:01 2008
@@ -46,7 +46,7 @@
 
 #define IF_ROUNDED(style, rounded, otherwise) (GET_ROUNDED_BUTTONS (style) ? rounded : otherwise)
 
-static GtkStyleClass *parent_class;
+G_DEFINE_DYNAMIC_TYPE (IndustrialStyle, industrial_style, GTK_TYPE_STYLE)
 
 static void
 draw_rounded_gradient (cairo_t    *cr,
@@ -907,7 +907,7 @@
 			height -= 1;
 		}
 
-		parent_class->draw_flat_box (style, window, state_type,
+		GTK_STYLE_CLASS (industrial_style_parent_class)->draw_flat_box (style, window, state_type,
 					     shadow_type, area, widget, detail,
 					     x, y, width, height);
 	} else if (CHECK_DETAIL (detail, "slider")
@@ -982,7 +982,7 @@
 				draw_rounded_rect (cr, x, y, width, height, IF_ROUNDED (style, 1.5, 0),
 						   &bevel, &bg, corners);
 			} else {
-				parent_class->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+				GTK_STYLE_CLASS (industrial_style_parent_class)->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 			}
 		} else if (shadow_type != GTK_SHADOW_NONE) {
 			draw_rounded_rect (cr, x, y, width, height, IF_ROUNDED (style, 1.5, 0),
@@ -1064,7 +1064,7 @@
 		return;
 	}
 	
-	parent_class->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height);
+	GTK_STYLE_CLASS (industrial_style_parent_class)->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height);
 }
 
 static void
@@ -1658,4 +1658,68 @@
 	return stated;
 }
 
-#include "industrial_style_versioned_code.h"
+/* Non-drawing stuff */
+
+void
+industrial_style_register_types (GTypeModule *module)
+{
+	industrial_style_register_type (module);
+}
+
+static void
+industrial_style_copy (GtkStyle * style, GtkStyle * src)
+{
+	IndustrialStyle *industrial_style = INDUSTRIAL_STYLE (style);
+	IndustrialStyle *industrial_src = INDUSTRIAL_STYLE (src);
+
+	industrial_style->contrast = industrial_src->contrast;
+	industrial_style->rounded_buttons = industrial_src->rounded_buttons;
+
+	GTK_STYLE_CLASS (industrial_style_parent_class)->copy (style, src);
+}
+
+static void
+industrial_style_init_from_rc (GtkStyle * style, GtkRcStyle * rc_style)
+{
+	IndustrialStyle *industrial_style = INDUSTRIAL_STYLE (style);
+	GTK_STYLE_CLASS (industrial_style_parent_class)->init_from_rc (style, rc_style);
+
+	industrial_style->contrast = INDUSTRIAL_RC_STYLE (rc_style)->contrast;
+	industrial_style->rounded_buttons = INDUSTRIAL_RC_STYLE (rc_style)->rounded_buttons;
+	industrial_style->hint = INDUSTRIAL_RC_STYLE (rc_style)->hint;
+}
+
+static void
+industrial_style_init (IndustrialStyle * style)
+{
+	style->contrast = 1.0;
+	style->rounded_buttons = TRUE;
+	style->hint = 0;
+}
+
+static void
+industrial_style_class_init (IndustrialStyleClass * klass)
+{
+	GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
+
+	style_class->copy = industrial_style_copy;
+	style_class->init_from_rc = industrial_style_init_from_rc;
+
+	style_class->draw_focus = draw_focus;
+
+	style_class->draw_handle = draw_handle;
+	style_class->draw_vline = draw_vline;
+	style_class->draw_hline = draw_hline;
+	style_class->draw_slider = draw_slider;
+
+	style_class->draw_check = draw_check;
+	style_class->draw_box = draw_box;
+	style_class->draw_shadow = draw_shadow;
+	style_class->draw_box_gap = draw_box_gap;
+	style_class->draw_shadow_gap = draw_shadow_gap;
+	style_class->draw_extension = draw_extension;
+	style_class->draw_option = draw_option;
+	style_class->render_icon = render_icon;
+}
+
+

Modified: trunk/engines/industrial/src/industrial_style.h
==============================================================================
--- trunk/engines/industrial/src/industrial_style.h	(original)
+++ trunk/engines/industrial/src/industrial_style.h	Sun Nov 30 20:26:01 2008
@@ -30,9 +30,7 @@
 typedef struct _IndustrialStyle IndustrialStyle;
 typedef struct _IndustrialStyleClass IndustrialStyleClass;
 
-GE_INTERNAL extern GType industrial_type_style;
-
-#define INDUSTRIAL_TYPE_STYLE              industrial_type_style
+#define INDUSTRIAL_TYPE_STYLE              (industrial_style_get_type ())
 #define INDUSTRIAL_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), INDUSTRIAL_TYPE_STYLE, IndustrialStyle))
 #define INDUSTRIAL_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), INDUSTRIAL_TYPE_STYLE, IndustrialStyleClass))
 #define INDUSTRIAL_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), INDUSTRIAL_TYPE_STYLE))
@@ -51,4 +49,6 @@
 	GtkStyleClass parent_class;
 };
 
-GE_INTERNAL void industrial_style_register_type (GTypeModule * module);
+GE_INTERNAL void industrial_style_register_types (GTypeModule * module);
+GE_INTERNAL GType industrial_style_get_type      (void);
+

Modified: trunk/engines/industrial/src/industrial_theme_main.c
==============================================================================
--- trunk/engines/industrial/src/industrial_theme_main.c	(original)
+++ trunk/engines/industrial/src/industrial_theme_main.c	Sun Nov 30 20:26:01 2008
@@ -7,8 +7,8 @@
 GE_EXPORT void
 theme_init (GTypeModule * module)
 {
-	industrial_rc_style_register_type (module);
-	industrial_style_register_type (module);
+	industrial_rc_style_register_types (module);
+	industrial_style_register_types (module);
 }
 
 GE_EXPORT void
@@ -21,3 +21,4 @@
 {
 	return GTK_RC_STYLE (g_object_new (INDUSTRIAL_TYPE_RC_STYLE, NULL));
 }
+

Modified: trunk/engines/lua/src/lua_rc_style.c
==============================================================================
--- trunk/engines/lua/src/lua_rc_style.c	(original)
+++ trunk/engines/lua/src/lua_rc_style.c	Sun Nov 30 20:26:01 2008
@@ -1,8 +1,8 @@
 #include "lua_style.h"
 #include "lua_rc_style.h"
 
-static void      lua_rc_style_init         (LuaRcStyle      *style);
-static void      lua_rc_style_class_init   (LuaRcStyleClass *klass);
+G_DEFINE_DYNAMIC_TYPE (LuaRcStyle, lua_rc_style, GTK_TYPE_RC_STYLE)
+
 static GtkStyle *lua_rc_style_create_style (GtkRcStyle             *rc_style);
 static guint     lua_rc_style_parse        (GtkRcStyle             *rc_style,
                                             GtkSettings            *settings,
@@ -11,10 +11,6 @@
                                             GtkRcStyle             *src);
 
 
-static GtkRcStyleClass *parent_class;
-
-GType type_lua_rc_style = 0;
-
 enum
 {
 	TOKEN_THEME = G_TOKEN_LAST + 1,
@@ -34,33 +30,17 @@
 	{ "FALSE",	TOKEN_FALSE }
 };
 
-
 void
-lua_rc_style_register_type (GTypeModule *module)
+lua_rc_style_register_types (GTypeModule *module)
 {
-	static const GTypeInfo object_info =
-	{
-		sizeof (LuaRcStyleClass),
-		(GBaseInitFunc) NULL,
-		(GBaseFinalizeFunc) NULL,
-		(GClassInitFunc) lua_rc_style_class_init,
-		NULL,           /* class_finalize */
-		NULL,           /* class_data */
-		sizeof (LuaRcStyle),
-		0,              /* n_preallocs */
-		(GInstanceInitFunc) lua_rc_style_init,
-		NULL
-	};
-
-	type_lua_rc_style = g_type_module_register_type (module,
-	                                                 GTK_TYPE_RC_STYLE,
-	                                                 "LuaRcStyle",
-	                                                 &object_info, 0);
+	lua_rc_style_register_type (module);
 }
 
 static void
 lua_rc_style_init (LuaRcStyle *lua_rc)
 {
+	/* FIXME: Uhm, this is BROKEN, at least at a later point a
+	 *        non static string is assigned, and will NOT be freed. */
 	lua_rc->theme = "";
 }
 
@@ -69,13 +49,16 @@
 {
 	GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
 
-	parent_class = g_type_class_peek_parent (klass);
-
 	rc_style_class->parse = lua_rc_style_parse;
 	rc_style_class->create_style = lua_rc_style_create_style;
 	rc_style_class->merge = lua_rc_style_merge;
 }
 
+static void
+lua_rc_style_class_finalize (LuaRcStyleClass *klass)
+{
+}
+
 static guint
 gtk2_rc_parse_boolean (GtkSettings *settings,
                        GScanner    *scanner,
@@ -254,7 +237,7 @@
 {
 	LuaRcStyle *dest_w, *src_w;
 	
-	parent_class->merge (dest, src);
+	GTK_RC_STYLE_CLASS (lua_rc_style_parent_class)->merge (dest, src);
 	
 	if (!IS_LUA_RC_STYLE (src))
 		return;

Modified: trunk/engines/lua/src/lua_rc_style.h
==============================================================================
--- trunk/engines/lua/src/lua_rc_style.h	(original)
+++ trunk/engines/lua/src/lua_rc_style.h	Sun Nov 30 20:26:01 2008
@@ -5,9 +5,7 @@
 typedef struct _LuaRcStyle LuaRcStyle;
 typedef struct _LuaRcStyleClass LuaRcStyleClass;
 
-GE_INTERNAL extern GType type_lua_rc_style;
-
-#define TYPE_LUA_RC_STYLE              type_lua_rc_style
+#define TYPE_LUA_RC_STYLE              (lua_rc_style_get_type ())
 #define LUA_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), TYPE_LUA_RC_STYLE, LuaRcStyle))
 #define LUA_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LUA_RC_STYLE, LuaRcStyleClass))
 #define IS_LUA_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), TYPE_LUA_RC_STYLE))
@@ -26,4 +24,6 @@
 	GtkRcStyleClass parent_class;
 };
 
-GE_INTERNAL void lua_rc_style_register_type (GTypeModule *module);
+GE_INTERNAL void  lua_rc_style_register_types (GTypeModule *module);
+GE_INTERNAL GType lua_rc_style_get_type (void);
+

Modified: trunk/engines/lua/src/lua_style.c
==============================================================================
--- trunk/engines/lua/src/lua_style.c	(original)
+++ trunk/engines/lua/src/lua_style.c	Sun Nov 30 20:26:01 2008
@@ -29,7 +29,7 @@
                      gint            width, \
                      gint            height
 
-static GtkStyleClass *parent_class;
+G_DEFINE_DYNAMIC_TYPE (LuaStyle, lua_style, GTK_TYPE_STYLE)
 
 static gchar *
 get_name_for_state (gint state)
@@ -258,7 +258,7 @@
 static void
 lua_style_draw_flat_box (DRAW_ARGS)
 {
-	parent_class->draw_flat_box (style, window, state_type,
+	GTK_STYLE_CLASS (lua_style_parent_class)->draw_flat_box (style, window, state_type,
 	                             shadow_type,
 	                             area, widget, detail,
 	                             x, y, width, height);
@@ -304,7 +304,7 @@
 	                    gint            gap_x,
 	                    gint            gap_width)
 {
-	parent_class->draw_box_gap (style, window, state_type, shadow_type,
+	GTK_STYLE_CLASS (lua_style_parent_class)->draw_box_gap (style, window, state_type, shadow_type,
 	                            area, widget, detail,
 	                            x, y, width, height,
 	                            gap_side, gap_x, gap_width);
@@ -313,7 +313,7 @@
 static void
 lua_style_draw_extension (DRAW_ARGS, GtkPositionType gap_side)
 {
-	parent_class->draw_extension (style, window, state_type, shadow_type, area,
+	GTK_STYLE_CLASS (lua_style_parent_class)->draw_extension (style, window, state_type, shadow_type, area,
 	                              widget, detail, x, y, width, height,
 	                              gap_side);
 }
@@ -321,7 +321,7 @@
 static void 
 lua_style_draw_handle (DRAW_ARGS, GtkOrientation orientation)
 {
-	parent_class->draw_handle (style, window, state_type, shadow_type, area,
+	GTK_STYLE_CLASS (lua_style_parent_class)->draw_handle (style, window, state_type, shadow_type, area,
 	                               widget, detail, x, y, width, height,
 	                               orientation);
 }
@@ -491,7 +491,7 @@
 	{
 		//g_printf ("DRAW BOX: Unrecognized detail string: %s\n", detail);
 		lua_style_close_cairo (lua_style);
-		parent_class->draw_box (style, window, state_type, shadow_type, area,
+		GTK_STYLE_CLASS (lua_style_parent_class)->draw_box (style, window, state_type, shadow_type, area,
 		                        widget, detail, x, y, width, height);
 	}
     
@@ -501,7 +501,7 @@
 static void
 lua_style_draw_slider (DRAW_ARGS, GtkOrientation orientation)
 {
-	parent_class->draw_slider (style, window, state_type, shadow_type, area,
+	GTK_STYLE_CLASS (lua_style_parent_class)->draw_slider (style, window, state_type, shadow_type, area,
 	                           widget, detail, x, y, width, height, orientation);
 }
 
@@ -632,7 +632,7 @@
                            gint            gap_x,
                            gint            gap_width)
 {
-	parent_class->draw_shadow_gap (style, window, state_type, shadow_type, area,
+	GTK_STYLE_CLASS (lua_style_parent_class)->draw_shadow_gap (style, window, state_type, shadow_type, area,
 	                               widget, detail, x, y, width, height,
 	                               gap_side, gap_x, gap_width);
 }
@@ -667,7 +667,7 @@
                       gint           width,
                       gint           height)
 {
-	parent_class->draw_arrow (style, window, state_type, shadow, area,
+	GTK_STYLE_CLASS (lua_style_parent_class)->draw_arrow (style, window, state_type, shadow, area,
 	                          widget, detail, arrow_type, fill,
 	                          x, y, width, height);
 }
@@ -678,7 +678,7 @@
 {
 	LuaStyle *lua_style = LUA_STYLE (style);
 
-	parent_class->init_from_rc (style, rc_style);
+	GTK_STYLE_CLASS (lua_style_parent_class)->init_from_rc (style, rc_style);
 	
 	lua_style->theme = LUA_RC_STYLE (rc_style)->theme;
 }
@@ -693,7 +693,7 @@
 	double contrast;
 	int i;
 	
-	parent_class->realize (style);
+	GTK_STYLE_CLASS (lua_style_parent_class)->realize (style);
 	
 	/* Lighter to darker */
 	ge_gdk_color_to_cairo (&style->bg[GTK_STATE_NORMAL], &bg_normal);
@@ -730,7 +730,7 @@
 static void
 lua_style_copy (GtkStyle *style, GtkStyle *src)
 {
-	parent_class->copy (style, src);
+	GTK_STYLE_CLASS (lua_style_parent_class)->copy (style, src);
 }
 
 static void
@@ -738,7 +738,7 @@
 {
 	LuaStyle *lua_style = LUA_STYLE (style);
 	
-	parent_class->unrealize (style);
+	GTK_STYLE_CLASS (lua_style_parent_class)->unrealize (style);
 	
 	if (lua_style->L)
 		lua_close (lua_style->L);
@@ -754,8 +754,6 @@
 {
 	GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
 	
-	parent_class = g_type_class_peek_parent (klass);
-
 	style_class->copy             = lua_style_copy;
 	style_class->realize          = lua_style_realize;
 	style_class->unrealize        = lua_style_unrealize;
@@ -780,27 +778,14 @@
 	/*style_class->render_icon      = lua_style_draw_render_icon;*/
 }
 
-GType type_lua_style = 0;
+static void
+lua_style_class_finalize (LuaStyleClass *klass)
+{
+}
 
 void
-lua_style_register_type (GTypeModule *module)
+lua_style_register_types (GTypeModule *module)
 {
-	static const GTypeInfo object_info =
-	{
-		sizeof (LuaStyleClass),
-		(GBaseInitFunc) NULL,
-		(GBaseFinalizeFunc) NULL,
-		(GClassInitFunc) lua_style_class_init,
-		NULL,         /* class_finalize */
-		NULL,         /* class_data */
-		sizeof (LuaStyle),
-		0,            /* n_preallocs */
-		(GInstanceInitFunc) lua_style_init,
-		NULL
-	};
-
-	type_lua_style = g_type_module_register_type (module,
-	                                              GTK_TYPE_STYLE,
-	                                              "LuaStyle",
-	                                              &object_info, 0);
+	lua_style_register_type (module);
 }
+

Modified: trunk/engines/lua/src/lua_style.h
==============================================================================
--- trunk/engines/lua/src/lua_style.h	(original)
+++ trunk/engines/lua/src/lua_style.h	Sun Nov 30 20:26:01 2008
@@ -7,9 +7,7 @@
 typedef struct _LuaStyle LuaStyle;
 typedef struct _LuaStyleClass LuaStyleClass;
 
-GE_INTERNAL extern GType type_lua_style;
-
-#define TYPE_LUA_STYLE              type_lua_style
+#define TYPE_LUA_STYLE              (lua_style_get_type ())
 #define LUA_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), TYPE_LUA_STYLE, LuaStyle))
 #define LUA_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LUA_STYLE, LuaStyleClass))
 #define LUA_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), TYPE_LUA_STYLE))
@@ -42,4 +40,6 @@
 };
 
 
-GE_INTERNAL void lua_style_register_type (GTypeModule *module);
+GE_INTERNAL void  lua_style_register_types (GTypeModule *module);
+GE_INTERNAL GType lua_style_get_type (void);
+

Modified: trunk/engines/lua/src/main.c
==============================================================================
--- trunk/engines/lua/src/main.c	(original)
+++ trunk/engines/lua/src/main.c	Sun Nov 30 20:26:01 2008
@@ -7,8 +7,8 @@
 GE_EXPORT void
 theme_init (GTypeModule *module)
 {
-	lua_rc_style_register_type (module);
-	lua_style_register_type (module);
+	lua_rc_style_register_types (module);
+	lua_style_register_types (module);
 }
 
 GE_EXPORT void

Modified: trunk/engines/mist/src/mist-rc-style.c
==============================================================================
--- trunk/engines/mist/src/mist-rc-style.c	(original)
+++ trunk/engines/mist/src/mist-rc-style.c	Sun Nov 30 20:26:01 2008
@@ -1,8 +1,8 @@
 #include "mist-rc-style.h"
 #include "mist-style.h"
 
-static void      mist_rc_style_init         (MistRcStyle      *style);
-static void      mist_rc_style_class_init   (MistRcStyleClass *klass);
+G_DEFINE_DYNAMIC_TYPE (MistRcStyle, mist_rc_style, GTK_TYPE_RC_STYLE)
+
 static guint     mist_rc_style_parse        (GtkRcStyle       *rc_style,
 					     GtkSettings      *settings,
 					     GScanner         *scanner);
@@ -10,30 +10,10 @@
 					     GtkRcStyle       *src);
 static GtkStyle *mist_rc_style_create_style (GtkRcStyle       *rc_style);
 
-static GtkRcStyleClass *mist_parent_rc_style_class;
-
-GType mist_type_rc_style = 0;
-
 void
-mist_rc_style_register_type (GTypeModule *module)
+mist_rc_style_register_types (GTypeModule *module)
 {
-	static const GTypeInfo object_info =
-		{
-			sizeof (MistRcStyleClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) mist_rc_style_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (MistRcStyle),
-			0,              /* n_preallocs */
-			(GInstanceInitFunc) mist_rc_style_init,
-		};
-	
-	mist_type_rc_style = g_type_module_register_type (module,
-							  GTK_TYPE_RC_STYLE,
-							  "MistRcStyle",
-							  &object_info, 0);
+	mist_rc_style_register_type (module);
 }
 
 static void
@@ -45,13 +25,17 @@
 mist_rc_style_class_init (MistRcStyleClass *klass)
 {
 	GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
-	mist_parent_rc_style_class = g_type_class_peek_parent (klass);
 	
 	rc_style_class->parse = mist_rc_style_parse;
 	rc_style_class->merge = mist_rc_style_merge;
 	rc_style_class->create_style = mist_rc_style_create_style;
 }
 
+static void
+mist_rc_style_class_finalize (MistRcStyleClass *klass)
+{
+}
+
 static guint
 mist_rc_style_parse (GtkRcStyle *rc_style,
 			GtkSettings  *settings,
@@ -96,7 +80,7 @@
 mist_rc_style_merge (GtkRcStyle * dest,
 		     GtkRcStyle * src)
 {
-	mist_parent_rc_style_class->merge (dest, src);
+	GTK_RC_STYLE_CLASS (mist_rc_style_parent_class)->merge (dest, src);
 }
 
 /* Create an empty style suitable to this RC style

Modified: trunk/engines/mist/src/mist-rc-style.h
==============================================================================
--- trunk/engines/mist/src/mist-rc-style.h	(original)
+++ trunk/engines/mist/src/mist-rc-style.h	Sun Nov 30 20:26:01 2008
@@ -4,9 +4,7 @@
 typedef struct _MistRcStyle MistRcStyle;
 typedef struct _MistRcStyleClass MistRcStyleClass;
 
-GE_INTERNAL extern GType mist_type_rc_style;
-
-#define MIST_TYPE_RC_STYLE              mist_type_rc_style
+#define MIST_TYPE_RC_STYLE              (mist_rc_style_get_type ())
 #define MIST_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MIST_TYPE_RC_STYLE, MistRcStyle))
 #define MIST_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MIST_TYPE_RC_STYLE, MistRcStyleClass))
 #define MIST_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), MIST_TYPE_RC_STYLE))
@@ -21,4 +19,6 @@
 	GtkRcStyleClass parent_class;
 };
 
-GE_INTERNAL void mist_rc_style_register_type (GTypeModule *module);
+GE_INTERNAL void  mist_rc_style_register_types (GTypeModule *module);
+GE_INTERNAL GType mist_rc_style_get_type       (void);
+

Modified: trunk/engines/mist/src/mist-style.c
==============================================================================
--- trunk/engines/mist/src/mist-style.c	(original)
+++ trunk/engines/mist/src/mist-style.c	Sun Nov 30 20:26:01 2008
@@ -17,11 +17,17 @@
 #define YTHICKNESS(style) (style->ythickness)
 #define XTHICKNESS(style) (style->xthickness)
 
-static GtkStyleClass *mist_parent_style_class = NULL;
+G_DEFINE_DYNAMIC_TYPE (MistStyle, mist_style, GTK_TYPE_STYLE)
 
 static void mist_style_init       (MistStyle      *style);
 static void mist_style_class_init (MistStyleClass *klass);
 
+void
+mist_style_register_types (GTypeModule *module)
+{
+	mist_style_register_type (module);
+}
+
 static GtkShadowType
 mist_get_shadow_type (GtkStyle *style, const char *detail, GtkShadowType requested)
 {
@@ -1366,29 +1372,6 @@
 	cairo_destroy (cr);
 }
 
-GType mist_type_style = 0;
-
-void
-mist_style_register_type (GTypeModule *module)
-{
-	static const GTypeInfo object_info = {
-		sizeof (MistStyleClass),
-		(GBaseInitFunc) NULL,
-		(GBaseFinalizeFunc) NULL,
-		(GClassInitFunc) mist_style_class_init,
-		NULL,           /* class_finalize */
-		NULL,           /* class_data */
-		sizeof (MistStyle),
-		0,              /* n_preallocs */
-		(GInstanceInitFunc) mist_style_init,
-	};
-	
-	mist_type_style = g_type_module_register_type (module,
-						       GTK_TYPE_STYLE,
-						       "MistStyle",
-						       &object_info, 0);
-}
-
 static void
 mist_style_init (MistStyle *style)
 {
@@ -1399,7 +1382,7 @@
 {
   MistStyle *mist_style = MIST_STYLE (style);
  
-  mist_parent_style_class->realize (style);
+  GTK_STYLE_CLASS (mist_style_parent_class)->realize (style);
  
   ge_gtk_style_to_cairo_color_cube (style, &mist_style->color_cube);
 }
@@ -1409,8 +1392,6 @@
 {
 	GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
 	
-	mist_parent_style_class = g_type_class_peek_parent (klass);
-	
 	style_class->realize = mist_style_realize;
 
 	style_class->draw_hline = mist_style_draw_hline;
@@ -1432,3 +1413,8 @@
 	style_class->render_icon = mist_style_render_icon;
 	style_class->draw_focus = mist_style_draw_focus;
 }
+
+static void
+mist_style_class_finalize (MistStyleClass *klass)
+{
+}

Modified: trunk/engines/mist/src/mist-style.h
==============================================================================
--- trunk/engines/mist/src/mist-style.h	(original)
+++ trunk/engines/mist/src/mist-style.h	Sun Nov 30 20:26:01 2008
@@ -4,9 +4,7 @@
 typedef struct _MistStyle MistStyle;
 typedef struct _MistStyleClass MistStyleClass;
 
-GE_INTERNAL extern GType mist_type_style;
-
-#define MIST_TYPE_STYLE              mist_type_style
+#define MIST_TYPE_STYLE              (mist_style_get_type ())
 #define MIST_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MIST_TYPE_STYLE, MistStyle))
 #define MIST_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MIST_TYPE_STYLE, MistStyleClass))
 #define MIST_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), MIST_TYPE_STYLE))
@@ -25,5 +23,6 @@
   GtkStyleClass parent_class;
 };
 
-GE_INTERNAL void mist_style_register_type (GTypeModule *module);
+GE_INTERNAL void  mist_style_register_types (GTypeModule *module);
+GE_INTERNAL GType mist_style_get_type       (void);
 

Modified: trunk/engines/mist/src/mist.c
==============================================================================
--- trunk/engines/mist/src/mist.c	(original)
+++ trunk/engines/mist/src/mist.c	Sun Nov 30 20:26:01 2008
@@ -6,8 +6,8 @@
 GE_EXPORT void
 theme_init (GTypeModule *module)
 {
-	mist_rc_style_register_type (module);
-	mist_style_register_type (module);
+	mist_rc_style_register_types (module);
+	mist_style_register_types (module);
 }
 
 GE_EXPORT void

Modified: trunk/engines/redmond/src/redmond_gtk2_engine.c
==============================================================================
--- trunk/engines/redmond/src/redmond_gtk2_engine.c	(original)
+++ trunk/engines/redmond/src/redmond_gtk2_engine.c	Sun Nov 30 20:26:01 2008
@@ -27,8 +27,9 @@
 /**********************************/ 
 /* Register & Initialize RC Style */ 
 /**********************************/ 
-GType redmond_type_rc_style = 0;
- 
+
+G_DEFINE_DYNAMIC_TYPE (RedmondRcStyle, redmond_rc_style, GTK_TYPE_RC_STYLE)
+
 /* Create an empty style suitable to this RC style */ 
 static GtkStyle *
 redmond_rc_style_create_style (GtkRcStyle * rc_style)
@@ -37,39 +38,28 @@
 }
  
 static void
+redmond_rc_style_init (RedmondRcStyle *rc_style)
+{
+}
+
+static void
 redmond_rc_style_class_init (RedmondRcStyleClass * klass)
 {
   GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
  
   rc_style_class->create_style = redmond_rc_style_create_style;
 }
- 
+
 static void
-redmond_rc_style_register_type (GTypeModule * module)
+redmond_rc_style_class_finalize (RedmondRcStyleClass * klass)
 {
-  static const GTypeInfo object_info = {
-    sizeof (RedmondRcStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) redmond_rc_style_class_init,
-    NULL,			/* class_finalize */
-    NULL,			/* class_data */
-    sizeof (RedmondRcStyle),
-    0,				/* n_preallocs */
-    (GInstanceInitFunc) NULL,
-  };
- 
-  redmond_type_rc_style = g_type_module_register_type (module,
-						       GTK_TYPE_RC_STYLE,
-						       "RedmondRcStyle",
-						       &object_info, 0);
 }
  
 /***************************************/ 
 /* Register & Initialize Drawing Style */ 
 /***************************************/ 
-GType redmond_type_style = 0;
-static GtkStyleClass *redmond_style_parent_class;
+
+G_DEFINE_DYNAMIC_TYPE (RedmondStyle, redmond_style, GTK_TYPE_STYLE)
 
 static void
 redmond_simple_hatch_mask_pattern(CairoPattern *pattern)
@@ -109,7 +99,7 @@
   RedmondStyle *redmond_style = REDMOND_STYLE (style);
   int i;
  
-  redmond_style_parent_class->realize (style);
+  GTK_STYLE_CLASS (redmond_style_parent_class)->realize (style);
  
   ge_gtk_style_to_cairo_color_cube (style, &redmond_style->color_cube);
 
@@ -144,16 +134,19 @@
 		ge_cairo_pattern_destroy(redmond_style->bg_image[i]);
         }
 
-  redmond_style_parent_class->unrealize (style);
+  GTK_STYLE_CLASS (redmond_style_parent_class)->unrealize (style);
 }
- 
+
+static void
+redmond_style_init (RedmondStyle *style)
+{
+}
+
 static void
 redmond_style_class_init (RedmondStyleClass * klass)
 {
   GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
  
-  redmond_style_parent_class = g_type_class_peek_parent (klass);
- 
   style_class->realize = redmond_style_realize;
   style_class->unrealize = redmond_style_unrealize;
  
@@ -169,28 +162,12 @@
   style_class->draw_extension = redmond_draw_extension;
   style_class->draw_handle = redmond_draw_handle;
 }
-  
+
 static void
-redmond_style_register_type (GTypeModule * module)
+redmond_style_class_finalize (RedmondStyleClass * klass)
 {
-  static const GTypeInfo object_info = {
-    sizeof (RedmondStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) redmond_style_class_init,
-    NULL,			/* class_finalize */
-    NULL,			/* class_data */
-    sizeof (RedmondStyle),
-    0,				/* n_preallocs */
-    (GInstanceInitFunc) NULL,
-  };
- 
-  redmond_type_style = g_type_module_register_type (module,
-						    GTK_TYPE_STYLE,
-						    "RedmondStyle",
-						    &object_info, 0);
 }
- 
+   
 /****************/ 
 /* Engine Hooks */ 
 /****************/ 

Modified: trunk/engines/redmond/src/redmond_gtk2_engine.h
==============================================================================
--- trunk/engines/redmond/src/redmond_gtk2_engine.h	(original)
+++ trunk/engines/redmond/src/redmond_gtk2_engine.h	Sun Nov 30 20:26:01 2008
@@ -31,9 +31,8 @@
 /*****************************/
 /* RC Style Declaration      */
 /*****************************/
-GE_INTERNAL extern GType redmond_type_rc_style;
- 
-#define REDMOND_TYPE_RC_STYLE              redmond_type_rc_style
+
+#define REDMOND_TYPE_RC_STYLE              (redmond_rc_style_get_type ())
 #define REDMOND_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), REDMOND_TYPE_RC_STYLE, RedmondRcStyle))
 #define REDMOND_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), REDMOND_TYPE_RC_STYLE, RedmondRcStyleClass))
 #define REDMOND_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), REDMOND_TYPE_RC_STYLE))
@@ -49,13 +48,14 @@
 {
   GtkRcStyleClass parent_class;
 } RedmondRcStyleClass;
+
+GE_INTERNAL GType redmond_rc_style_get_type (void);
  
 /*****************************/
 /* Drawing Style Declaration */
 /*****************************/
-GE_INTERNAL extern GType redmond_type_style;
  
-#define REDMOND_TYPE_STYLE              redmond_type_style
+#define REDMOND_TYPE_STYLE              (redmond_style_get_type ())
 #define REDMOND_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), REDMOND_TYPE_STYLE, RedmondStyle))
 #define REDMOND_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), REDMOND_TYPE_STYLE, RedmondStyleClass))
 #define REDMOND_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), REDMOND_TYPE_STYLE))
@@ -78,3 +78,6 @@
 {
   GtkStyleClass parent_class;
 } RedmondStyleClass;
+
+GE_INTERNAL GType redmond_style_get_type (void);
+

Modified: trunk/engines/thinice/src/thinice_main.c
==============================================================================
--- trunk/engines/thinice/src/thinice_main.c	(original)
+++ trunk/engines/thinice/src/thinice_main.c	Sun Nov 30 20:26:01 2008
@@ -5,8 +5,8 @@
 GE_EXPORT void
 theme_init (GTypeModule *module)
 {
-  thinice_rc_style_register_type (module);
-  thinice_style_register_type (module);
+  thinice_rc_style_register_types (module);
+  thinice_style_register_types (module);
 }
 
 GE_EXPORT void

Modified: trunk/engines/thinice/src/thinice_rc_style.c
==============================================================================
--- trunk/engines/thinice/src/thinice_rc_style.c	(original)
+++ trunk/engines/thinice/src/thinice_rc_style.c	Sun Nov 30 20:26:01 2008
@@ -1,8 +1,9 @@
 #include "thinice_rc_style.h"
 #include "thinice_style.h"
 
-static void      thinice_rc_style_init         (ThiniceRcStyle      *style);
-static void      thinice_rc_style_class_init   (ThiniceRcStyleClass *klass);
+G_DEFINE_DYNAMIC_TYPE (ThiniceRcStyle, thinice_rc_style, GTK_TYPE_RC_STYLE)
+
+
 static guint     thinice_rc_style_parse        (GtkRcStyle          *rc_style,
 					       GtkSettings          *settings,
 					       GScanner             *scanner);
@@ -45,30 +46,10 @@
 
 static guint n_thinice_rc_symbols = sizeof(thinice_rc_symbols) / sizeof(thinice_rc_symbols[0]);
 
-static GtkRcStyleClass *thinice_parent_rc_style_class;
-
-GType thinice_type_rc_style = 0;
-
 void
-thinice_rc_style_register_type (GTypeModule *module)
+thinice_rc_style_register_types (GTypeModule *module)
 {
-  static const GTypeInfo object_info =
-  {
-    sizeof (ThiniceRcStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) thinice_rc_style_class_init,
-    NULL,           /* class_finalize */
-    NULL,           /* class_data */
-    sizeof (ThiniceRcStyle),
-    0,              /* n_preallocs */
-    (GInstanceInitFunc) thinice_rc_style_init,
-  };
-  
-  thinice_type_rc_style = g_type_module_register_type (module,
-						      GTK_TYPE_RC_STYLE,
-						      "ThiniceRcStyle",
-						      &object_info, 0);
+	thinice_rc_style_register_type (module);
 }
 
 static void
@@ -82,13 +63,16 @@
 {
   GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
 
-  thinice_parent_rc_style_class = g_type_class_peek_parent (klass);
-
   rc_style_class->parse = thinice_rc_style_parse;
   rc_style_class->merge = thinice_rc_style_merge;
   rc_style_class->create_style = thinice_rc_style_create_style;
 }
 
+static void
+thinice_rc_style_class_finalize (ThiniceRcStyleClass *klass)
+{
+}
+
 #if 0
 static guint
 thinice_rc_parse_int(GScanner *scanner,
@@ -400,7 +384,7 @@
     dest_data->flags = dest_data->flags | src_data->flags;
   }
   
-  thinice_parent_rc_style_class->merge (dest, src);
+  GTK_RC_STYLE_CLASS (thinice_rc_style_parent_class)->merge (dest, src);
 }
 
 /* Create an empty style suitable to this RC style

Modified: trunk/engines/thinice/src/thinice_rc_style.h
==============================================================================
--- trunk/engines/thinice/src/thinice_rc_style.h	(original)
+++ trunk/engines/thinice/src/thinice_rc_style.h	Sun Nov 30 20:26:01 2008
@@ -4,9 +4,7 @@
 typedef struct _ThiniceRcStyle ThiniceRcStyle;
 typedef struct _ThiniceRcStyleClass ThiniceRcStyleClass;
 
-GE_INTERNAL extern GType thinice_type_rc_style;
-
-#define THINICE_TYPE_RC_STYLE              thinice_type_rc_style
+#define THINICE_TYPE_RC_STYLE              (thinice_rc_style_get_type ())
 #define THINICE_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), THINICE_TYPE_RC_STYLE, ThiniceRcStyle))
 #define THINICE_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), THINICE_TYPE_RC_STYLE, ThiniceRcStyleClass))
 #define THINICE_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), THINICE_TYPE_RC_STYLE))
@@ -42,7 +40,8 @@
   GtkRcStyleClass parent_class;
 };
 
-GE_INTERNAL void thinice_rc_style_register_type (GTypeModule *module);
+GE_INTERNAL void  thinice_rc_style_register_types (GTypeModule *module);
+GE_INTERNAL GType thinice_rc_style_get_type       (void);
 
 /* Default stuff */
 #define DEFAULT_SCROLLSHAPE       SCROLL_SHAPED

Modified: trunk/engines/thinice/src/thinice_style.h
==============================================================================
--- trunk/engines/thinice/src/thinice_style.h	(original)
+++ trunk/engines/thinice/src/thinice_style.h	Sun Nov 30 20:26:01 2008
@@ -4,9 +4,7 @@
 typedef struct _ThiniceStyle ThiniceStyle;
 typedef struct _ThiniceStyleClass ThiniceStyleClass;
 
-GE_INTERNAL extern GType thinice_type_style;
-
-#define THINICE_TYPE_STYLE              thinice_type_style
+#define THINICE_TYPE_STYLE              (thinice_style_get_type ())
 #define THINICE_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), THINICE_TYPE_STYLE, ThiniceStyle))
 #define THINICE_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), THINICE_TYPE_STYLE, ThiniceStyleClass))
 #define THINICE_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), THINICE_TYPE_STYLE))
@@ -24,6 +22,7 @@
   GtkStyleClass parent_class;
 };
 
-GE_INTERNAL void thinice_style_register_type (GTypeModule *module);
+GE_INTERNAL void  thinice_style_register_types (GTypeModule *module);
+GE_INTERNAL GType thinice_style_get_type       (void);
 
 

Modified: trunk/engines/thinice/src/thinice_theme_draw.c
==============================================================================
--- trunk/engines/thinice/src/thinice_theme_draw.c	(original)
+++ trunk/engines/thinice/src/thinice_theme_draw.c	Sun Nov 30 20:26:01 2008
@@ -26,10 +26,13 @@
 
 #define DRAW_VARS    style, window, state_type, shadow_type, area, widget, detail, x, y, width, height
 
-static void thinice_style_init       (ThiniceStyle      *style);
-static void thinice_style_class_init (ThiniceStyleClass *klass);
+G_DEFINE_DYNAMIC_TYPE (ThiniceStyle, thinice_style, GTK_TYPE_STYLE)
 
-static GtkStyleClass *thinice_parent_style_class = NULL;
+void
+thinice_style_register_types (GTypeModule *module)
+{
+	thinice_style_register_type (module);
+}
 
 static void
 thinice_style_draw_hline(GtkStyle * style,
@@ -1325,30 +1328,6 @@
     cairo_destroy(cr);
 }
 
-GType thinice_type_style = 0;
-
-void
-thinice_style_register_type (GTypeModule *module)
-{
-  static const GTypeInfo object_info =
-  {
-    sizeof (ThiniceStyleClass),
-    (GBaseInitFunc) NULL,
-    (GBaseFinalizeFunc) NULL,
-    (GClassInitFunc) thinice_style_class_init,
-    NULL,           /* class_finalize */
-    NULL,           /* class_data */
-    sizeof (ThiniceStyle),
-    0,              /* n_preallocs */
-    (GInstanceInitFunc) thinice_style_init,
-  };
-  
-  thinice_type_style = g_type_module_register_type (module,
-						    GTK_TYPE_STYLE,
-						    "ThiniceStyle",
-						    &object_info, 0);
-}
-
 static void
 thinice_style_init (ThiniceStyle *style)
 {
@@ -1359,7 +1338,7 @@
 {
   ThiniceStyle *thinice_style = THINICE_STYLE (style);
  
-  thinice_parent_style_class->realize (style);
+  GTK_STYLE_CLASS (thinice_style_parent_class)->realize (style);
  
   ge_gtk_style_to_cairo_color_cube (style, &thinice_style->color_cube);
 }
@@ -1369,8 +1348,6 @@
 {
   GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
 
-  thinice_parent_style_class = g_type_class_peek_parent (klass);
-
   style_class->realize = thinice_style_realize;
 
   style_class->draw_hline = thinice_style_draw_hline;
@@ -1391,6 +1368,10 @@
   style_class->draw_handle = thinice_style_draw_handle;
 }
 
+static void
+thinice_style_class_finalize (ThiniceStyleClass *klass)
+{
+}
 
 /*
 FIXME: file/font selector background OK



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]