[monkey-bubble: 653/753] use gnome-macros.h

[Sven Herzberg <herzi src gnome org>]

commit f50c5f974ddf669a290b66462e95e5645285c2a1
Author: George Lebl <jirka 5z com>
Date:   Fri Aug 24 08:08:13 2001 +0000

    use gnome-macros.h
    
    Fri Aug 24 07:57:50 2001  George Lebl <jirka 5z com>
    
    	* gnome-color-picker.c, gnome-font-picker.c: use gnome-macros.h

 libgnomeui/ChangeLog            |    4 +++
 libgnomeui/gnome-color-picker.c |   44 +++++++++-----------------------------
 libgnomeui/gnome-font-picker.c  |   38 +++++----------------------------
 3 files changed, 21 insertions(+), 65 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index b09c23a..a20aa33 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 24 07:57:50 2001  George Lebl <jirka 5z com>
+
+	* gnome-color-picker.c, gnome-font-picker.c: use gnome-macros.h
+
 Fri Aug 24 07:16:18 2001  George Lebl <jirka 5z com>
 
 	* gnome-font-picker.[ch]: move all fields to the private struct,
diff --git a/libgnomeui/gnome-color-picker.c b/libgnomeui/gnome-color-picker.c
index 6029ffb..2400dc6 100644
--- a/libgnomeui/gnome-color-picker.c
+++ b/libgnomeui/gnome-color-picker.c
@@ -28,6 +28,8 @@
  */
 
 #include <config.h>
+#include "gnome-macros.h"
+
 #include <gtk/gtkmain.h>
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkcolorsel.h>
@@ -122,32 +124,10 @@ static void gnome_color_picker_get_property (GObject            *object,
 
 static guint color_picker_signals[LAST_SIGNAL] = { 0 };
 
-static GtkButtonClass *parent_class;
-
 static GtkTargetEntry drop_types[] = { { "application/x-color", 0, 0 } };
 
-GtkType
-gnome_color_picker_get_type (void)
-{
-	static GtkType cp_type = 0;
-
-	if (!cp_type) {
-		GtkTypeInfo cp_info = {
-			"GnomeColorPicker",
-			sizeof (GnomeColorPicker),
-			sizeof (GnomeColorPickerClass),
-			(GtkClassInitFunc) gnome_color_picker_class_init,
-			(GtkObjectInitFunc) gnome_color_picker_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cp_type = gtk_type_unique (gtk_button_get_type (), &cp_info);
-	}
-
-	return cp_type;
-}
+GNOME_CLASS_BOILERPLATE (GnomeColorPicker, gnome_color_picker,
+			 GtkButton, gtk_button)
 
 static void
 gnome_color_picker_class_init (GnomeColorPickerClass *class)
@@ -161,7 +141,6 @@ gnome_color_picker_class_init (GnomeColorPickerClass *class)
 	gobject_class = (GObjectClass *) class;
 	button_class = (GtkButtonClass *) class;
 	widget_class = (GtkWidgetClass *) class;
-	parent_class = gtk_type_class (gtk_button_get_type ());
 
 	color_picker_signals[COLOR_SET] =
 		gtk_signal_new ("color_set",
@@ -378,15 +357,16 @@ gnome_color_picker_realize (GtkWidget *widget)
 {
 	GnomeColorPicker *cp = GNOME_COLOR_PICKER (widget);
 
-	if (GTK_WIDGET_CLASS(parent_class)->realize)
-		GTK_WIDGET_CLASS (parent_class)->realize (widget);
+	GNOME_CALL_PARENT_HANDLER (GTK_WIDGET_CLASS, realize, (widget));
+
 	render (cp);
 }
 static void
 gnome_color_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)
 {
-	if (GTK_WIDGET_CLASS(parent_class)->style_set)
-		GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
+	GNOME_CALL_PARENT_HANDLER (GTK_WIDGET_CLASS, style_set,
+				   (widget, previous_style));
+
 	if (GTK_WIDGET_REALIZED (widget))
 		render (GNOME_COLOR_PICKER (widget));
 }
@@ -545,8 +525,7 @@ gnome_color_picker_destroy (GtkObject *object)
 	g_free (cp->_priv->title);
 	cp->_priv->title = NULL;
 
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+	GNOME_CALL_PARENT_HANDLER (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -562,8 +541,7 @@ gnome_color_picker_finalize (GObject *object)
 	g_free (cp->_priv);
 	cp->_priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	GNOME_CALL_PARENT_HANDLER (G_OBJECT_CLASS, finalize, (object));
 }
 
 
diff --git a/libgnomeui/gnome-font-picker.c b/libgnomeui/gnome-font-picker.c
index 0e6b354..ccef478 100644
--- a/libgnomeui/gnome-font-picker.c
+++ b/libgnomeui/gnome-font-picker.c
@@ -20,6 +20,8 @@
  */
 
 #include <config.h>
+#include "gnome-macros.h"
+
 #include <gtk/gtksignal.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkalignment.h>
@@ -120,31 +122,8 @@ static void gnome_font_picker_update_font_info(GnomeFontPicker *gfs);
 
 static guint font_picker_signals[LAST_SIGNAL] = { 0 };
 
-static GtkButtonClass *parent_class;
-
-
-GtkType
-gnome_font_picker_get_type (void)
-{
-	static GtkType fp_type = 0;
-
-	if ( ! fp_type) {
-		GtkTypeInfo fp_info = {
-			"GnomeFontPicker",
-			sizeof (GnomeFontPicker),
-			sizeof (GnomeFontPickerClass),
-			(GtkClassInitFunc) gnome_font_picker_class_init,
-			(GtkObjectInitFunc) gnome_font_picker_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		fp_type = gtk_type_unique (gtk_button_get_type (), &fp_info);
-	}
-
-	return fp_type;
-}
+GNOME_CLASS_BOILERPLATE (GnomeFontPicker, gnome_font_picker,
+			 GtkButton, gtk_button)
 
 static void
 gnome_font_picker_class_init (GnomeFontPickerClass *class)
@@ -157,9 +136,6 @@ gnome_font_picker_class_init (GnomeFontPickerClass *class)
 	gobject_class = (GObjectClass *) class;
 	button_class = (GtkButtonClass *) class;
 
-	parent_class = gtk_type_class (gtk_button_get_type ());
-
-
 	/* By default we link to The World Food Programme */
 	g_object_class_install_property
 		(gobject_class,
@@ -287,8 +263,7 @@ gnome_font_picker_destroy (GtkObject *object)
     g_free(gfp->_priv->title);
     gfp->_priv->title = NULL;
 
-    if (GTK_OBJECT_CLASS (parent_class)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+    GNOME_CALL_PARENT_HANDLER (GTK_OBJECT_CLASS, destroy, (object));
     
 } /* gnome_font_picker_destroy */
 
@@ -306,8 +281,7 @@ gnome_font_picker_finalize (GObject *object)
     g_free(gfp->_priv);
     gfp->_priv = NULL;
 
-    if (G_OBJECT_CLASS (parent_class)->finalize)
-        (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+    GNOME_CALL_PARENT_HANDLER (G_OBJECT_CLASS, finalize, (object));
     
 } /* gnome_font_picker_finalize */