GNOME.org
 

libbonoboui r2632 - in trunk: . bonobo samples/compound-doc/bonobo-hello

Author: chpe
Date: Thu Jun 19 14:12:29 2008
New Revision: 2632
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2632&view=rev

Log:
	* bonobo/bonobo-canvas-component.c: (root_item_hack_get_type):
	* bonobo/bonobo-canvas-item.h:
	* bonobo/bonobo-dock-band.h:
	* bonobo/bonobo-dock-item.h:
	* bonobo/bonobo-dock.h:
	* bonobo/bonobo-plug.h:
	* bonobo/bonobo-property-control.h:
	* bonobo/bonobo-selector-widget.h:
	* bonobo/bonobo-selector.h:
	* bonobo/bonobo-socket.h:
	* bonobo/bonobo-ui-config-widget.h:
	* bonobo/bonobo-ui-sync.c:
	* bonobo/bonobo-ui-toolbar-button-item.h:
	* bonobo/bonobo-ui-toolbar-control-item.h:
	* bonobo/bonobo-ui-toolbar-item.h:
	* bonobo/bonobo-ui-toolbar-popup-item.h:
	* bonobo/bonobo-ui-toolbar-toggle-button-item.h:
	* bonobo/bonobo-ui-toolbar.h:
	* bonobo/bonobo-ui-xml.c:
	* bonobo/bonobo-ui-xml.h:
	* bonobo/bonobo-widget.h:
	* bonobo/bonobo-window.h:
	* bonobo/bonobo-wrapper.h:
	* samples/compound-doc/bonobo-hello/hello-embeddable.h:
	* samples/compound-doc/bonobo-hello/hello-view.h: Use GType
	and the
	G_TYPE_* macros instead of the deprecated GtkType and GTK_*
	macros.
	Allows building libbonoboui using programmes with
	GTK_DISABLE_DEPRECATED again.


Modified:
   trunk/ChangeLog
   trunk/bonobo/bonobo-canvas-component.c
   trunk/bonobo/bonobo-canvas-item.h
   trunk/bonobo/bonobo-dock-band.h
   trunk/bonobo/bonobo-dock-item.h
   trunk/bonobo/bonobo-dock.h
   trunk/bonobo/bonobo-plug.h
   trunk/bonobo/bonobo-property-control.h
   trunk/bonobo/bonobo-selector-widget.h
   trunk/bonobo/bonobo-selector.h
   trunk/bonobo/bonobo-socket.h
   trunk/bonobo/bonobo-ui-config-widget.h
   trunk/bonobo/bonobo-ui-sync.c
   trunk/bonobo/bonobo-ui-toolbar-button-item.h
   trunk/bonobo/bonobo-ui-toolbar-control-item.h
   trunk/bonobo/bonobo-ui-toolbar-item.h
   trunk/bonobo/bonobo-ui-toolbar-popup-item.h
   trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.h
   trunk/bonobo/bonobo-ui-toolbar.h
   trunk/bonobo/bonobo-ui-xml.c
   trunk/bonobo/bonobo-ui-xml.h
   trunk/bonobo/bonobo-widget.h
   trunk/bonobo/bonobo-window.h
   trunk/bonobo/bonobo-wrapper.h
   trunk/samples/compound-doc/bonobo-hello/hello-embeddable.h
   trunk/samples/compound-doc/bonobo-hello/hello-view.h

Modified: trunk/bonobo/bonobo-canvas-component.c
==============================================================================
--- trunk/bonobo/bonobo-canvas-component.c	(original)
+++ trunk/bonobo/bonobo-canvas-component.c	Thu Jun 19 14:12:29 2008
@@ -940,7 +940,7 @@
 
 static GType root_item_hack_get_type (void);
 #define ROOT_ITEM_HACK_TYPE (root_item_hack_get_type ())
-#define ROOT_ITEM_HACK(obj) (GTK_CHECK_CAST((obj), ROOT_ITEM_HACK_TYPE, RootItemHack))
+#define ROOT_ITEM_HACK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ROOT_ITEM_HACK_TYPE, RootItemHack))
 
 static void
 rih_dispose (GObject *obj)
@@ -996,7 +996,7 @@
 static GType
 root_item_hack_get_type (void)
 {
-	static GtkType type = 0;
+	static GType type = 0;
 
 	if (!type) {
 		GTypeInfo info = {

Modified: trunk/bonobo/bonobo-canvas-item.h
==============================================================================
--- trunk/bonobo/bonobo-canvas-item.h	(original)
+++ trunk/bonobo/bonobo-canvas-item.h	Thu Jun 19 14:12:29 2008
@@ -18,9 +18,9 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_CANVAS_ITEM          (bonobo_canvas_item_get_type ())
-#define BONOBO_CANVAS_ITEM(obj)          (GTK_CHECK_CAST((obj), bonobo_canvas_item_get_type (), BonoboCanvasItem))
-#define BONOBO_CANVAS_ITEM_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), bonobo_canvas_item_get_type (), BonoboCanvasItemClass))
-#define BONOBO_IS_CANVAS_ITEM(o)         (GTK_CHECK_TYPE((o), bonobo_canvas_item_get_type ()))
+#define BONOBO_CANVAS_ITEM(obj)          (G_TYPE_CHECK_INSTANCE_CAST((obj), bonobo_canvas_item_get_type (), BonoboCanvasItem))
+#define BONOBO_CANVAS_ITEM_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), bonobo_canvas_item_get_type (), BonoboCanvasItemClass))
+#define BONOBO_IS_CANVAS_ITEM(o)         (G_TYPE_CHECK_INSTANCE_TYPE((o), bonobo_canvas_item_get_type ()))
 
 typedef struct _BonoboCanvasItemPrivate BonoboCanvasItemPrivate;
 typedef struct _BonoboCanvasItem        BonoboCanvasItem;

Modified: trunk/bonobo/bonobo-dock-band.h
==============================================================================
--- trunk/bonobo/bonobo-dock-band.h	(original)
+++ trunk/bonobo/bonobo-dock-band.h	Thu Jun 19 14:12:29 2008
@@ -102,7 +102,7 @@
 };
 
 GtkWidget     *bonobo_dock_band_new              (void);
-GtkType        bonobo_dock_band_get_type         (void) G_GNUC_CONST;
+GType        bonobo_dock_band_get_type         (void) G_GNUC_CONST;
    
 void           bonobo_dock_band_set_orientation  (BonoboDockBand *band,
                                                  GtkOrientation orientation);

Modified: trunk/bonobo/bonobo-dock-item.h
==============================================================================
--- trunk/bonobo/bonobo-dock-item.h	(original)
+++ trunk/bonobo/bonobo-dock-item.h	Thu Jun 19 14:12:29 2008
@@ -105,7 +105,7 @@
 };
 
 /* Public methods.  */
-GtkType        bonobo_dock_item_get_type        (void) G_GNUC_CONST;
+GType        bonobo_dock_item_get_type        (void) G_GNUC_CONST;
 GtkWidget     *bonobo_dock_item_new             (const gchar *name,
                                                 BonoboDockItemBehavior behavior);
 void           bonobo_dock_item_construct       (BonoboDockItem *new_dock_item,

Modified: trunk/bonobo/bonobo-dock.h
==============================================================================
--- trunk/bonobo/bonobo-dock.h	(original)
+++ trunk/bonobo/bonobo-dock.h	Thu Jun 19 14:12:29 2008
@@ -89,7 +89,7 @@
 };
 
 GtkWidget     *bonobo_dock_new               (void);
-GtkType        bonobo_dock_get_type          (void) G_GNUC_CONST;
+GType        bonobo_dock_get_type          (void) G_GNUC_CONST;
 
 void           bonobo_dock_allow_floating_items
                                             (BonoboDock *dock,

Modified: trunk/bonobo/bonobo-plug.h
==============================================================================
--- trunk/bonobo/bonobo-plug.h	(original)
+++ trunk/bonobo/bonobo-plug.h	Thu Jun 19 14:12:29 2008
@@ -37,9 +37,9 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_PLUG          (bonobo_plug_get_type ())
-#define BONOBO_PLUG(obj)          GTK_CHECK_CAST (obj, bonobo_plug_get_type (), BonoboPlug)
-#define BONOBO_PLUG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, bonobo_plug_get_type (), BonoboPlugClass)
-#define BONOBO_IS_PLUG(obj)       GTK_CHECK_TYPE (obj, bonobo_plug_get_type ())
+#define BONOBO_PLUG(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, bonobo_plug_get_type (), BonoboPlug)
+#define BONOBO_PLUG_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, bonobo_plug_get_type (), BonoboPlugClass)
+#define BONOBO_IS_PLUG(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, bonobo_plug_get_type ())
 
 typedef struct _BonoboPlugPrivate BonoboPlugPrivate;
 
@@ -56,7 +56,7 @@
 	gpointer dummy[4];
 } BonoboPlugClass;
 
-GtkType        bonobo_plug_get_type        (void) G_GNUC_CONST;
+GType        bonobo_plug_get_type        (void) G_GNUC_CONST;
 void           bonobo_plug_construct       (BonoboPlug    *plug,
 					    guint32        socket_id);
 void           bonobo_plug_construct_full  (BonoboPlug    *plug,

Modified: trunk/bonobo/bonobo-property-control.h
==============================================================================
--- trunk/bonobo/bonobo-property-control.h	(original)
+++ trunk/bonobo/bonobo-property-control.h	Thu Jun 19 14:12:29 2008
@@ -21,10 +21,10 @@
 #define BONOBO_PROPERTY_CONTROL_CHANGED "Bonobo::PropertyControl_changed"
 
 #define BONOBO_TYPE_PROPERTY_CONTROL        (bonobo_property_control_get_type ())
-#define BONOBO_PROPERTY_CONTROL(o)          (GTK_CHECK_CAST ((o), BONOBO_TYPE_PROPERTY_CONTROL, BonoboPropertyControl))
-#define BONOBO_PROPERTY_CONTROL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), BONOBO_TYPE_PROPERTY_CONTROL, BonoboPropertyControlClass))
-#define BONOBO_IS_PROPERTY_CONTROL(o)       (GTK_CHECK_TYPE ((o), BONOBO_TYPE_PROPERTY_CONTROL))
-#define BONOBO_IS_PROPERTY_CONTROL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), BONOBO_TYPE_PROPERTY_CONTROL))
+#define BONOBO_PROPERTY_CONTROL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), BONOBO_TYPE_PROPERTY_CONTROL, BonoboPropertyControl))
+#define BONOBO_PROPERTY_CONTROL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), BONOBO_TYPE_PROPERTY_CONTROL, BonoboPropertyControlClass))
+#define BONOBO_IS_PROPERTY_CONTROL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), BONOBO_TYPE_PROPERTY_CONTROL))
+#define BONOBO_IS_PROPERTY_CONTROL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), BONOBO_TYPE_PROPERTY_CONTROL))
 
 typedef BonoboControl *(* BonoboPropertyControlGetControlFn) (BonoboPropertyControl *control,
 							      int page_number,
@@ -47,7 +47,7 @@
 			 Bonobo_PropertyControl_Action action);
 } BonoboPropertyControlClass;
 
-GtkType bonobo_property_control_get_type (void) G_GNUC_CONST;
+GType bonobo_property_control_get_type (void) G_GNUC_CONST;
 
 BonoboPropertyControl *bonobo_property_control_construct (BonoboPropertyControl *property_control,
 							  BonoboEventSource     *event_source,

Modified: trunk/bonobo/bonobo-selector-widget.h
==============================================================================
--- trunk/bonobo/bonobo-selector-widget.h	(original)
+++ trunk/bonobo/bonobo-selector-widget.h	Thu Jun 19 14:12:29 2008
@@ -15,9 +15,9 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_SELECTOR_WIDGET             (bonobo_selector_widget_get_type ())
-#define BONOBO_SELECTOR_WIDGET(obj)		GTK_CHECK_CAST(obj,  bonobo_selector_widget_get_type (), BonoboSelectorWidget)
-#define BONOBO_SELECTOR_WIDGET_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, bonobo_selector_widget_get_type (), BonoboSelectorWidgetClass)
-#define BONOBO_IS_SELECTOR_WIDGET(obj)		GTK_CHECK_TYPE (obj, bonobo_selector_widget_get_type ())
+#define BONOBO_SELECTOR_WIDGET(obj)		G_TYPE_CHECK_INSTANCE_CAST(obj,  bonobo_selector_widget_get_type (), BonoboSelectorWidget)
+#define BONOBO_SELECTOR_WIDGET_CLASS(klass)	G_TYPE_CHECK_CLASS_CAST (klass, bonobo_selector_widget_get_type (), BonoboSelectorWidgetClass)
+#define BONOBO_IS_SELECTOR_WIDGET(obj)		G_TYPE_CHECK_INSTANCE_TYPE (obj, bonobo_selector_widget_get_type ())
 
 typedef struct _BonoboSelectorWidgetPrivate BonoboSelectorWidgetPrivate;
 
@@ -43,7 +43,7 @@
 	gpointer dummy[2];
 } BonoboSelectorWidgetClass;
 
-GtkType	   bonobo_selector_widget_get_type (void) G_GNUC_CONST;
+GType	   bonobo_selector_widget_get_type (void) G_GNUC_CONST;
 
 GtkWidget *bonobo_selector_widget_new      (void);
 

Modified: trunk/bonobo/bonobo-selector.h
==============================================================================
--- trunk/bonobo/bonobo-selector.h	(original)
+++ trunk/bonobo/bonobo-selector.h	Thu Jun 19 14:12:29 2008
@@ -22,9 +22,9 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_SELECTOR            (bonobo_selector_get_type ())
-#define BONOBO_SELECTOR(obj)		GTK_CHECK_CAST(obj, bonobo_selector_get_type (), BonoboSelector)
-#define BONOBO_SELECTOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, bonobo_selector_get_type (), BonoboSelectorClass)
-#define BONOBO_IS_SELECTOR(obj)		GTK_CHECK_TYPE (obj, bonobo_selector_get_type ())
+#define BONOBO_SELECTOR(obj)		G_TYPE_CHECK_INSTANCE_CAST(obj, bonobo_selector_get_type (), BonoboSelector)
+#define BONOBO_SELECTOR_CLASS(klass)	G_TYPE_CHECK_CLASS_CAST (klass, bonobo_selector_get_type (), BonoboSelectorClass)
+#define BONOBO_IS_SELECTOR(obj)		G_TYPE_CHECK_INSTANCE_TYPE (obj, bonobo_selector_get_type ())
 
 typedef struct _BonoboSelectorPrivate BonoboSelectorPrivate;
 typedef struct _BonoboSelector        BonoboSelector;
@@ -44,7 +44,7 @@
 	gpointer dummy[2];
 } BonoboSelectorClass;
 
-GtkType	   bonobo_selector_get_type        (void) G_GNUC_CONST;
+GType	   bonobo_selector_get_type        (void) G_GNUC_CONST;
 
 GtkWidget *bonobo_selector_construct       (BonoboSelector       *sel,
 					    const gchar          *title,

Modified: trunk/bonobo/bonobo-socket.h
==============================================================================
--- trunk/bonobo/bonobo-socket.h	(original)
+++ trunk/bonobo/bonobo-socket.h	Thu Jun 19 14:12:29 2008
@@ -36,9 +36,9 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_SOCKET          (bonobo_socket_get_type ())
-#define BONOBO_SOCKET(obj)          GTK_CHECK_CAST (obj, bonobo_socket_get_type (), BonoboSocket)
-#define BONOBO_SOCKET_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, bonobo_socket_get_type (), BonoboSocketClass)
-#define BONOBO_IS_SOCKET(obj)       GTK_CHECK_TYPE (obj, bonobo_socket_get_type ())
+#define BONOBO_SOCKET(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, bonobo_socket_get_type (), BonoboSocket)
+#define BONOBO_SOCKET_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, bonobo_socket_get_type (), BonoboSocketClass)
+#define BONOBO_IS_SOCKET(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, bonobo_socket_get_type ())
 
 struct _BonoboSocket {
 	GtkSocket           socket;

Modified: trunk/bonobo/bonobo-ui-config-widget.h
==============================================================================
--- trunk/bonobo/bonobo-ui-config-widget.h	(original)
+++ trunk/bonobo/bonobo-ui-config-widget.h	Thu Jun 19 14:12:29 2008
@@ -19,9 +19,9 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_UI_CONFIG_WIDGET            (bonobo_ui_config_widget_get_type ())
-#define BONOBO_UI_CONFIG_WIDGET(obj)		GTK_CHECK_CAST(obj,  bonobo_ui_config_widget_get_type (), BonoboUIConfigWidget)
-#define BONOBO_UI_CONFIG_WIDGET_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, bonobo_ui_config_widget_get_type (), BonoboUIConfigWidgetClass)
-#define BONOBO_IS_UI_CONFIG_WIDGET(obj)		GTK_CHECK_TYPE (obj, bonobo_ui_config_widget_get_type ())
+#define BONOBO_UI_CONFIG_WIDGET(obj)		G_TYPE_CHECK_INSTANCE_CAST(obj,  bonobo_ui_config_widget_get_type (), BonoboUIConfigWidget)
+#define BONOBO_UI_CONFIG_WIDGET_CLASS(klass)	G_TYPE_CHECK_CLASS_CAST (klass, bonobo_ui_config_widget_get_type (), BonoboUIConfigWidgetClass)
+#define BONOBO_IS_UI_CONFIG_WIDGET(obj)		G_TYPE_CHECK_INSTANCE_TYPE (obj, bonobo_ui_config_widget_get_type ())
 
 typedef struct _BonoboUIConfigWidgetPrivate BonoboUIConfigWidgetPrivate;
 
@@ -39,7 +39,7 @@
 	gpointer dummy[2];
 } BonoboUIConfigWidgetClass;
 
-GtkType	   bonobo_ui_config_widget_get_type  (void) G_GNUC_CONST;
+GType	   bonobo_ui_config_widget_get_type  (void) G_GNUC_CONST;
 
 GtkWidget *bonobo_ui_config_widget_construct (BonoboUIConfigWidget *config,
 					      BonoboUIEngine       *engine,

Modified: trunk/bonobo/bonobo-ui-sync.c
==============================================================================
--- trunk/bonobo/bonobo-ui-sync.c	(original)
+++ trunk/bonobo/bonobo-ui-sync.c	Thu Jun 19 14:12:29 2008
@@ -54,7 +54,7 @@
  * 
  * Synchronizer type function for derivation.
  * 
- * Return value: the GtkType index.
+ * Return value: the GType index.
  **/
 GType
 bonobo_ui_sync_get_type (void)

Modified: trunk/bonobo/bonobo-ui-toolbar-button-item.h
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-button-item.h	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-button-item.h	Thu Jun 19 14:12:29 2008
@@ -20,10 +20,10 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM		(bonobo_ui_toolbar_button_item_get_type ())
-#define BONOBO_UI_TOOLBAR_BUTTON_ITEM(obj)		(GTK_CHECK_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM, BonoboUIToolbarButtonItem))
-#define BONOBO_UI_TOOLBAR_BUTTON_ITEM_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM, BonoboUIToolbarButtonItemClass))
-#define BONOBO_IS_UI_TOOLBAR_BUTTON_ITEM(obj)		(GTK_CHECK_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM))
-#define BONOBO_IS_UI_TOOLBAR_BUTTON_ITEM_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM))
+#define BONOBO_UI_TOOLBAR_BUTTON_ITEM(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM, BonoboUIToolbarButtonItem))
+#define BONOBO_UI_TOOLBAR_BUTTON_ITEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM, BonoboUIToolbarButtonItemClass))
+#define BONOBO_IS_UI_TOOLBAR_BUTTON_ITEM(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM))
+#define BONOBO_IS_UI_TOOLBAR_BUTTON_ITEM_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_BUTTON_ITEM))
 
 typedef struct _BonoboUIToolbarButtonItemPrivate BonoboUIToolbarButtonItemPrivate;
 
@@ -49,7 +49,7 @@
 	gpointer dummy[2];
 } BonoboUIToolbarButtonItemClass;
 
-GtkType    bonobo_ui_toolbar_button_item_get_type           (void) G_GNUC_CONST;
+GType    bonobo_ui_toolbar_button_item_get_type           (void) G_GNUC_CONST;
 void       bonobo_ui_toolbar_button_item_construct          (BonoboUIToolbarButtonItem *item,
 							     GtkButton                 *button_widget,
 							     GdkPixbuf                 *icon,

Modified: trunk/bonobo/bonobo-ui-toolbar-control-item.h
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-control-item.h	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-control-item.h	Thu Jun 19 14:12:29 2008
@@ -19,10 +19,10 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM            (bonobo_ui_toolbar_control_item_get_type ())
-#define BONOBO_UI_TOOLBAR_CONTROL_ITEM(obj)            (GTK_CHECK_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM, BonoboUIToolbarControlItem))
-#define BONOBO_UI_TOOLBAR_CONTROL_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM, BonoboUIToolbarControlItemClass))
-#define BONOBO_IS_UI_TOOLBAR_CONTROL_ITEM(obj)         (GTK_CHECK_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM))
-#define BONOBO_IS_UI_TOOLBAR_CONTROL_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM))
+#define BONOBO_UI_TOOLBAR_CONTROL_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM, BonoboUIToolbarControlItem))
+#define BONOBO_UI_TOOLBAR_CONTROL_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM, BonoboUIToolbarControlItemClass))
+#define BONOBO_IS_UI_TOOLBAR_CONTROL_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM))
+#define BONOBO_IS_UI_TOOLBAR_CONTROL_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_CONTROL_ITEM))
 
 typedef enum {
 	BONOBO_UI_TOOLBAR_CONTROL_DISPLAY_CONTROL,
@@ -48,7 +48,7 @@
 	GtkToolButtonClass parent_class;
 } BonoboUIToolbarControlItemClass;
 
-GtkType       bonobo_ui_toolbar_control_item_get_type    (void) G_GNUC_CONST;
+GType       bonobo_ui_toolbar_control_item_get_type    (void) G_GNUC_CONST;
 GtkWidget    *bonobo_ui_toolbar_control_item_new         (Bonobo_Control control_ref);
 GtkWidget    *bonobo_ui_toolbar_control_item_new_widget  (GtkWidget *custom_in_proc_widget);
 GtkWidget    *bonobo_ui_toolbar_control_item_construct   (BonoboUIToolbarControlItem *control_item,

Modified: trunk/bonobo/bonobo-ui-toolbar-item.h
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-item.h	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-item.h	Thu Jun 19 14:12:29 2008
@@ -18,10 +18,10 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_UI_TOOLBAR_ITEM			(bonobo_ui_toolbar_item_get_type ())
-#define BONOBO_UI_TOOLBAR_ITEM(obj)			(GTK_CHECK_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_ITEM, BonoboUIToolbarItem))
-#define BONOBO_UI_TOOLBAR_ITEM_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_ITEM, BonoboUIToolbarItemClass))
-#define BONOBO_IS_UI_TOOLBAR_ITEM(obj)			(GTK_CHECK_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_ITEM))
-#define BONOBO_IS_UI_TOOLBAR_ITEM_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_ITEM))
+#define BONOBO_UI_TOOLBAR_ITEM(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_ITEM, BonoboUIToolbarItem))
+#define BONOBO_UI_TOOLBAR_ITEM_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_ITEM, BonoboUIToolbarItemClass))
+#define BONOBO_IS_UI_TOOLBAR_ITEM(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_ITEM))
+#define BONOBO_IS_UI_TOOLBAR_ITEM_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_ITEM))
 
 
 typedef enum {
@@ -63,7 +63,7 @@
 } BonoboUIToolbarItemClass;
 
 
-GtkType                   bonobo_ui_toolbar_item_get_type         (void) G_GNUC_CONST;
+GType                   bonobo_ui_toolbar_item_get_type         (void) G_GNUC_CONST;
 GtkWidget                *bonobo_ui_toolbar_item_new              (void);
 void                      bonobo_ui_toolbar_item_set_tooltip      (BonoboUIToolbarItem      *item,
 								   GtkTooltips              *tooltips,

Modified: trunk/bonobo/bonobo-ui-toolbar-popup-item.h
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-popup-item.h	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-popup-item.h	Thu Jun 19 14:12:29 2008
@@ -17,10 +17,10 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM            (bonobo_ui_toolbar_popup_item_get_type ())
-#define BONOBO_UI_TOOLBAR_POPUP_ITEM(obj)            (GTK_CHECK_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM, BonoboUIToolbarPopupItem))
-#define BONOBO_UI_TOOLBAR_POPUP_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM, BonoboUIToolbarPopupItemClass))
-#define BONOBO_IS_UI_TOOLBAR_POPUP_ITEM(obj)	     (GTK_CHECK_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM))
-#define BONOBO_IS_UI_TOOLBAR_POPUP_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM))
+#define BONOBO_UI_TOOLBAR_POPUP_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM, BonoboUIToolbarPopupItem))
+#define BONOBO_UI_TOOLBAR_POPUP_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM, BonoboUIToolbarPopupItemClass))
+#define BONOBO_IS_UI_TOOLBAR_POPUP_ITEM(obj)	     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM))
+#define BONOBO_IS_UI_TOOLBAR_POPUP_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_POPUP_ITEM))
 
 
 typedef struct _BonoboUIToolbarPopupItemPrivate BonoboUIToolbarPopupItemPrivate;
@@ -34,7 +34,7 @@
 } BonoboUIToolbarPopupItemClass;
 
 
-GtkType    bonobo_ui_toolbar_popup_item_get_type  (void) G_GNUC_CONST;
+GType    bonobo_ui_toolbar_popup_item_get_type  (void) G_GNUC_CONST;
 GtkWidget *bonobo_ui_toolbar_popup_item_new       (void);
 void       bonobo_ui_toolbar_popup_item_construct (BonoboUIToolbarPopupItem *);
 

Modified: trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.h
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.h	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-toggle-button-item.h	Thu Jun 19 14:12:29 2008
@@ -19,10 +19,10 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM             (bonobo_ui_toolbar_toggle_button_item_get_type ())
-#define BONOBO_UI_TOOLBAR_TOGGLE_BUTTON_ITEM(obj)             (GTK_CHECK_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM, BonoboUIToolbarToggleButtonItem))
-#define BONOBO_UI_TOOLBAR_TOGGLE_BUTTON_ITEM_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM, BonoboUIToolbarToggleButtonItemClass))
-#define BONOBO_IS_UI_TOOLBAR_TOGGLE_BUTTON_ITEM(obj)          (GTK_CHECK_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM))
-#define BONOBO_IS_UI_TOOLBAR_TOGGLE_BUTTON_ITEM_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM))
+#define BONOBO_UI_TOOLBAR_TOGGLE_BUTTON_ITEM(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM, BonoboUIToolbarToggleButtonItem))
+#define BONOBO_UI_TOOLBAR_TOGGLE_BUTTON_ITEM_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM, BonoboUIToolbarToggleButtonItemClass))
+#define BONOBO_IS_UI_TOOLBAR_TOGGLE_BUTTON_ITEM(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM))
+#define BONOBO_IS_UI_TOOLBAR_TOGGLE_BUTTON_ITEM_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR_TOGGLE_BUTTON_ITEM))
 
 
 typedef struct _BonoboUIToolbarToggleButtonItemPrivate BonoboUIToolbarToggleButtonItemPrivate;
@@ -40,7 +40,7 @@
 } BonoboUIToolbarToggleButtonItemClass;
 
 
-GtkType    bonobo_ui_toolbar_toggle_button_item_get_type   (void) G_GNUC_CONST;
+GType    bonobo_ui_toolbar_toggle_button_item_get_type   (void) G_GNUC_CONST;
 void       bonobo_ui_toolbar_toggle_button_item_construct  (BonoboUIToolbarToggleButtonItem *toggle_button_item,
 							 GdkPixbuf                     *icon,
 							 const char                    *label);

Modified: trunk/bonobo/bonobo-ui-toolbar.h
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar.h	(original)
+++ trunk/bonobo/bonobo-ui-toolbar.h	Thu Jun 19 14:12:29 2008
@@ -20,10 +20,10 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_UI_TOOLBAR            (bonobo_ui_toolbar_get_type ())
-#define BONOBO_UI_TOOLBAR(obj)            (GTK_CHECK_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR, BonoboUIToolbar))
-#define BONOBO_UI_TOOLBAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR, BonoboUIToolbarClass))
-#define BONOBO_IS_UI_TOOLBAR(obj)         (GTK_CHECK_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR))
-#define BONOBO_IS_UI_TOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR))
+#define BONOBO_UI_TOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), BONOBO_TYPE_UI_TOOLBAR, BonoboUIToolbar))
+#define BONOBO_UI_TOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), BONOBO_TYPE_UI_TOOLBAR, BonoboUIToolbarClass))
+#define BONOBO_IS_UI_TOOLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BONOBO_TYPE_UI_TOOLBAR))
+#define BONOBO_IS_UI_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BONOBO_TYPE_UI_TOOLBAR))
 
 typedef enum {
 	BONOBO_UI_TOOLBAR_STYLE_PRIORITY_TEXT,
@@ -50,7 +50,7 @@
 	gpointer dummy[4];
 } BonoboUIToolbarClass;
 
-GtkType               bonobo_ui_toolbar_get_type         (void) G_GNUC_CONST;
+GType               bonobo_ui_toolbar_get_type         (void) G_GNUC_CONST;
 void                  bonobo_ui_toolbar_construct        (BonoboUIToolbar      *toolbar);
 GtkWidget            *bonobo_ui_toolbar_new              (void);
 

Modified: trunk/bonobo/bonobo-ui-xml.c
==============================================================================
--- trunk/bonobo/bonobo-ui-xml.c	(original)
+++ trunk/bonobo/bonobo-ui-xml.c	Thu Jun 19 14:12:29 2008
@@ -936,7 +936,7 @@
 /**
  * bonobo_cmd_model_get_type:
  *
- * Returns the GtkType for the BonoboCmdModel class.
+ * Returns the GType for the BonoboCmdModel class.
  */
 GType
 bonobo_ui_xml_get_type (void)

Modified: trunk/bonobo/bonobo-ui-xml.h
==============================================================================
--- trunk/bonobo/bonobo-ui-xml.h	(original)
+++ trunk/bonobo/bonobo-ui-xml.h	Thu Jun 19 14:12:29 2008
@@ -78,7 +78,7 @@
 	gpointer               dummy;
 } BonoboUIXmlClass;
 
-GtkType          bonobo_ui_xml_get_type          (void) G_GNUC_CONST;
+GType          bonobo_ui_xml_get_type          (void) G_GNUC_CONST;
 
 BonoboUIXml     *bonobo_ui_xml_new               (BonoboUIXmlCompareFn  compare,
 						  BonoboUIXmlDataNewFn  data_new,

Modified: trunk/bonobo/bonobo-widget.h
==============================================================================
--- trunk/bonobo/bonobo-widget.h	(original)
+++ trunk/bonobo/bonobo-widget.h	Thu Jun 19 14:12:29 2008
@@ -19,10 +19,10 @@
 G_BEGIN_DECLS
  
 #define BONOBO_TYPE_WIDGET        (bonobo_widget_get_type ())
-#define BONOBO_WIDGET(o)          (GTK_CHECK_CAST ((o), BONOBO_TYPE_WIDGET, BonoboWidget))
-#define BONOBO_WIDGET_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), BONOBO_TYPE_WIDGET, BonoboWidgetClass))
-#define BONOBO_IS_WIDGET(o)       (GTK_CHECK_TYPE ((o), BONOBO_TYPE_WIDGET))
-#define BONOBO_IS_WIDGET_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), BONOBO_TYPE_WIDGET))
+#define BONOBO_WIDGET(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), BONOBO_TYPE_WIDGET, BonoboWidget))
+#define BONOBO_WIDGET_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), BONOBO_TYPE_WIDGET, BonoboWidgetClass))
+#define BONOBO_IS_WIDGET(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), BONOBO_TYPE_WIDGET))
+#define BONOBO_IS_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), BONOBO_TYPE_WIDGET))
 
 struct _BonoboWidget;
 typedef struct _BonoboWidget BonoboWidget;
@@ -44,7 +44,7 @@
 	gpointer dummy[4];
 } BonoboWidgetClass;
 
-GtkType             bonobo_widget_get_type                 (void) G_GNUC_CONST;
+GType             bonobo_widget_get_type                 (void) G_GNUC_CONST;
 Bonobo_Unknown      bonobo_widget_get_objref               (BonoboWidget      *bw);
 
 /*

Modified: trunk/bonobo/bonobo-window.h
==============================================================================
--- trunk/bonobo/bonobo-window.h	(original)
+++ trunk/bonobo/bonobo-window.h	Thu Jun 19 14:12:29 2008
@@ -19,10 +19,10 @@
 G_BEGIN_DECLS
 
 #define BONOBO_TYPE_WINDOW        (bonobo_window_get_type ())
-#define BONOBO_WINDOW(o)          (GTK_CHECK_CAST ((o), BONOBO_TYPE_WINDOW, BonoboWindow))
-#define BONOBO_WINDOW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), BONOBO_TYPE_WINDOW, BonoboWindowClass))
-#define BONOBO_IS_WINDOW(o)       (GTK_CHECK_TYPE ((o), BONOBO_TYPE_WINDOW))
-#define BONOBO_IS_WINDOW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), BONOBO_TYPE_WINDOW))
+#define BONOBO_WINDOW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), BONOBO_TYPE_WINDOW, BonoboWindow))
+#define BONOBO_WINDOW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), BONOBO_TYPE_WINDOW, BonoboWindowClass))
+#define BONOBO_IS_WINDOW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), BONOBO_TYPE_WINDOW))
+#define BONOBO_IS_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), BONOBO_TYPE_WINDOW))
 
 typedef struct _BonoboWindowPrivate BonoboWindowPrivate;
 typedef struct _BonoboWindow        BonoboWindow;
@@ -39,7 +39,7 @@
 	gpointer dummy[4];
 } BonoboWindowClass;
 
-GtkType              bonobo_window_get_type                       (void) G_GNUC_CONST;
+GType              bonobo_window_get_type                       (void) G_GNUC_CONST;
 
 GtkWidget           *bonobo_window_construct                      (BonoboWindow      *win,
 								   BonoboUIContainer *ui_container,

Modified: trunk/bonobo/bonobo-wrapper.h
==============================================================================
--- trunk/bonobo/bonobo-wrapper.h	(original)
+++ trunk/bonobo/bonobo-wrapper.h	Thu Jun 19 14:12:29 2008
@@ -17,10 +17,10 @@
 
 
 #define GNOME_TYPE_WRAPPER            (bonobo_wrapper_get_type ())
-#define BONOBO_WRAPPER(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_WRAPPER, BonoboWrapper))
-#define BONOBO_WRAPPER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_WRAPPER, BonoboWrapperClass))
-#define BONOBO_IS_WRAPPER(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_WRAPPER))
-#define BONOBO_IS_WRAPPER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_WRAPPER))
+#define BONOBO_WRAPPER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_WRAPPER, BonoboWrapper))
+#define BONOBO_WRAPPER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_WRAPPER, BonoboWrapperClass))
+#define BONOBO_IS_WRAPPER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_WRAPPER))
+#define BONOBO_IS_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_WRAPPER))
 
 
 typedef struct _BonoboWrapperPrivate BonoboWrapperPrivate;
@@ -37,7 +37,7 @@
 } BonoboWrapperClass;
 
 
-GtkType		 bonobo_wrapper_get_type	(void) G_GNUC_CONST;
+GType		 bonobo_wrapper_get_type	(void) G_GNUC_CONST;
 GtkWidget	*bonobo_wrapper_new		(void);
 
 void		 bonobo_wrapper_set_covered	(BonoboWrapper *wrapper, gboolean covered);

Modified: trunk/samples/compound-doc/bonobo-hello/hello-embeddable.h
==============================================================================
--- trunk/samples/compound-doc/bonobo-hello/hello-embeddable.h	(original)
+++ trunk/samples/compound-doc/bonobo-hello/hello-embeddable.h	Thu Jun 19 14:12:29 2008
@@ -7,10 +7,10 @@
 typedef struct _HelloBonoboView       HelloBonoboView;
 
 #define HELLO_BONOBO_TYPE_EMBEDDABLE        (hello_bonobo_embeddable_get_type ())
-#define HELLO_BONOBO_EMBEDDABLE(o)          (GTK_CHECK_CAST ((o), HELLO_BONOBO_TYPE_EMBEDDABLE, HelloBonoboEmbeddable))
-#define HELLO_BONOBO_EMBEDDABLE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), HELLO_BONOBO_TYPE_EMBEDDABLE, HelloBonoboEmbeddableClass))
-#define HELLO_BONOBO_IS_EMBEDDABLE(o)       (GTK_CHECK_TYPE ((o), HELLO_BONOBO_TYPE_EMBEDDABLE))
-#define HELLO_BONOBO_IS_EMBEDDABLE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), HELLO_BONOBO_TYPE_EMBEDDABLE))
+#define HELLO_BONOBO_EMBEDDABLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), HELLO_BONOBO_TYPE_EMBEDDABLE, HelloBonoboEmbeddable))
+#define HELLO_BONOBO_EMBEDDABLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), HELLO_BONOBO_TYPE_EMBEDDABLE, HelloBonoboEmbeddableClass))
+#define HELLO_BONOBO_IS_EMBEDDABLE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), HELLO_BONOBO_TYPE_EMBEDDABLE))
+#define HELLO_BONOBO_IS_EMBEDDABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HELLO_BONOBO_TYPE_EMBEDDABLE))
 
 struct _HelloBonoboEmbeddable {
 	BonoboEmbeddable embeddable;
@@ -22,7 +22,7 @@
 	BonoboEmbeddableClass parent_class;
 } HelloBonoboEmbeddableClass;
 
-GtkType hello_bonobo_embeddable_get_type  (void);
+GType hello_bonobo_embeddable_get_type  (void);
 
 HelloBonoboEmbeddable *
         hello_bonobo_embeddable_construct (HelloBonoboEmbeddable *embeddable);

Modified: trunk/samples/compound-doc/bonobo-hello/hello-view.h
==============================================================================
--- trunk/samples/compound-doc/bonobo-hello/hello-view.h	(original)
+++ trunk/samples/compound-doc/bonobo-hello/hello-view.h	Thu Jun 19 14:12:29 2008
@@ -4,10 +4,10 @@
 #include <bonobo.h>
 
 #define HELLO_BONOBO_TYPE_VIEW        (hello_bonobo_view_get_type ())
-#define HELLO_BONOBO_VIEW(o)          (GTK_CHECK_CAST ((o), HELLO_BONOBO_TYPE_VIEW, HelloBonoboView))
-#define HELLO_BONOBO_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), HELLO_BONOBO_TYPE_VIEW, HelloBonoboViewClass))
-#define HELLO_BONOBO_IS_VIEW(o)       (GTK_CHECK_TYPE ((o), HELLO_BONOBO_TYPE_VIEW))
-#define HELLO_BONOBO_IS_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), HELLO_BONOBO_TYPE_VIEW))
+#define HELLO_BONOBO_VIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), HELLO_BONOBO_TYPE_VIEW, HelloBonoboView))
+#define HELLO_BONOBO_VIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), HELLO_BONOBO_TYPE_VIEW, HelloBonoboViewClass))
+#define HELLO_BONOBO_IS_VIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), HELLO_BONOBO_TYPE_VIEW))
+#define HELLO_BONOBO_IS_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), HELLO_BONOBO_TYPE_VIEW))
 
 struct _HelloBonoboView {
 	BonoboView view;
@@ -21,7 +21,7 @@
 	BonoboViewClass parent_class;
 } HelloBonoboViewClass;
 
-GtkType     hello_bonobo_view_get_type (void);
+GType     hello_bonobo_view_get_type (void);
 BonoboView *hello_bonobo_view_factory  (BonoboEmbeddable      *embeddable,
 					const Bonobo_ViewFrame view_frame,
 					void                  *closure);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]