Replace ugly macros with ugly boilerplate

[grits] / src / objects / gis-callback.h

diff --git a/src/objects/gis-callback.h b/src/objects/gis-callback.h
index 8677fa698fe12af0510306f71888be01dcaca0b0..f3eee6de59a4e71ef95ddb4e7049a6a3d720f4c1 100644 (file)
--- a/src/objects/gis-callback.h
+++ b/src/objects/gis-callback.h
@@ -23,12 +23,15 @@
 #include "gis-object.h"
 
 /* GisCallback */
-#define GIS_TYPE_CALLBACK (gis_callback_get_type())
+#define GIS_TYPE_CALLBACK            (gis_callback_get_type())
+#define GIS_CALLBACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_CALLBACK, GisCallback))
+#define GIS_IS_CALLBACK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_CALLBACK))
+#define GIS_CALLBACK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_CALLBACK, GisCallbackClass))
+#define GIS_IS_CALLBACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_CALLBACK))
+#define GIS_CALLBACK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_CALLBACK, GisCallbackClass))
 
-GOBJECT_HEAD(
-       GIS, CALLBACK,
-       Gis, Callback,
-       gis, callback);
+typedef struct _GisCallback      GisCallback;
+typedef struct _GisCallbackClass GisCallbackClass;
 
 typedef gpointer (*GisCallbackFunc)(GisCallback *callback, gpointer user_data);
 
@@ -42,6 +45,8 @@ struct _GisCallbackClass {
        GisObjectClass parent_class;
 };
 
+GType gis_callback_get_type(void);
+
 GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data);
 
 #endif