libgnomeui r5630 - in trunk: . demos libgnomeui
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: libgnomeui r5630 - in trunk: . demos libgnomeui
- Date: Thu, 19 Jun 2008 14:26:55 +0000 (UTC)
Author: chpe
Date: Thu Jun 19 14:26:54 2008
New Revision: 5630
URL: http://svn.gnome.org/viewvc/libgnomeui?rev=5630&view=rev
Log:
* demos/test-recently-used.c: (add_to_menu):
* libgnomeui/gnome-app-helper.c: (gnome_app_create_menus_interp),
(gnome_app_create_toolbar_interp),
(gnome_app_insert_menus_interp):
* libgnomeui/gnome-app-helper.h:
* libgnomeui/gnome-app.h:
* libgnomeui/gnome-appbar.h:
* libgnomeui/gnome-client.c: (interaction_key_new),
(gnome_client_request_interaction_internal),
(gnome_client_request_interaction_interp):
* libgnomeui/gnome-client.h:
* libgnomeui/gnome-color-picker.h:
* libgnomeui/gnome-dateedit.c:
* libgnomeui/gnome-dateedit.h:
* libgnomeui/gnome-dialog.h:
* libgnomeui/gnome-druid-page-edge.h:
* libgnomeui/gnome-druid-page-standard.h:
* libgnomeui/gnome-druid-page.h:
* libgnomeui/gnome-druid.c:
* libgnomeui/gnome-druid.h:
* libgnomeui/gnome-entry.h:
* libgnomeui/gnome-file-entry.h:
* libgnomeui/gnome-font-picker.h:
* libgnomeui/gnome-href.h:
* libgnomeui/gnome-icon-entry.h:
* libgnomeui/gnome-icon-item.h:
* libgnomeui/gnome-icon-list.h:
* libgnomeui/gnome-icon-sel.h:
* libgnomeui/gnome-mdi-child.h:
* libgnomeui/gnome-mdi-generic-child.c:
(gnome_mdi_generic_child_set_view_creator_full),
(gnome_mdi_generic_child_set_menu_creator_full),
(gnome_mdi_generic_child_set_config_func_full),
(gnome_mdi_generic_child_set_label_func_full):
* libgnomeui/gnome-mdi-generic-child.h:
* libgnomeui/gnome-mdi.h:
* libgnomeui/gnome-messagebox.h:
* libgnomeui/gnome-password-dialog.h:
* libgnomeui/gnome-pixmap-entry.h:
* libgnomeui/gnome-pixmap.h:
* libgnomeui/gnome-propertybox.h:
* libgnomeui/gnome-scores.c:
* libgnomeui/gnome-scores.h:
* libgnomeui/gnometypebuiltins_vars.c: Use GType and the
G_TYPE_* macros instead of the deprecated GtkType and GTK_*
macros.
Allows building libgnomeui using programmes with
GTK_DISABLE_DEPRECATED again.
Modified:
trunk/ChangeLog
trunk/demos/test-recently-used.c
trunk/libgnomeui/gnome-app-helper.c
trunk/libgnomeui/gnome-app-helper.h
trunk/libgnomeui/gnome-app.h
trunk/libgnomeui/gnome-appbar.h
trunk/libgnomeui/gnome-client.c
trunk/libgnomeui/gnome-client.h
trunk/libgnomeui/gnome-color-picker.h
trunk/libgnomeui/gnome-dateedit.c
trunk/libgnomeui/gnome-dateedit.h
trunk/libgnomeui/gnome-dialog.h
trunk/libgnomeui/gnome-druid-page-edge.h
trunk/libgnomeui/gnome-druid-page-standard.h
trunk/libgnomeui/gnome-druid-page.h
trunk/libgnomeui/gnome-druid.c
trunk/libgnomeui/gnome-druid.h
trunk/libgnomeui/gnome-entry.h
trunk/libgnomeui/gnome-file-entry.h
trunk/libgnomeui/gnome-font-picker.h
trunk/libgnomeui/gnome-href.h
trunk/libgnomeui/gnome-icon-entry.h
trunk/libgnomeui/gnome-icon-item.h
trunk/libgnomeui/gnome-icon-list.h
trunk/libgnomeui/gnome-icon-sel.h
trunk/libgnomeui/gnome-mdi-child.h
trunk/libgnomeui/gnome-mdi-generic-child.c
trunk/libgnomeui/gnome-mdi-generic-child.h
trunk/libgnomeui/gnome-mdi.h
trunk/libgnomeui/gnome-messagebox.h
trunk/libgnomeui/gnome-password-dialog.h
trunk/libgnomeui/gnome-pixmap-entry.h
trunk/libgnomeui/gnome-pixmap.h
trunk/libgnomeui/gnome-propertybox.h
trunk/libgnomeui/gnome-scores.c
trunk/libgnomeui/gnome-scores.h
trunk/libgnomeui/gnometypebuiltins_vars.c
Modified: trunk/demos/test-recently-used.c
==============================================================================
--- trunk/demos/test-recently-used.c (original)
+++ trunk/demos/test-recently-used.c Thu Jun 19 14:26:54 2008
@@ -60,7 +60,7 @@
gnome_recent_document_ref(doc);
gtk_object_set_data_full(GTK_OBJECT(mi), "doc",
doc,
- (GtkDestroyNotify)gnome_recent_document_unref);
+ (GDestroyNotify)gnome_recent_document_unref);
gtk_object_set_data(GTK_OBJECT(mi), "label", label);
Modified: trunk/libgnomeui/gnome-app-helper.c
==============================================================================
--- trunk/libgnomeui/gnome-app-helper.c (original)
+++ trunk/libgnomeui/gnome-app-helper.c Thu Jun 19 14:26:54 2008
@@ -1182,7 +1182,7 @@
typedef struct
{
GtkCallbackMarshal relay_func;
- GtkDestroyNotify destroy_func;
+ GDestroyNotify destroy_func;
gpointer user_data;
} SavedData;
@@ -1553,7 +1553,7 @@
void
gnome_app_create_menus_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
GtkCallbackMarshal relay_func, gpointer data,
- GtkDestroyNotify destroy_func)
+ GDestroyNotify destroy_func)
{
GnomeUIBuilderData uibdata;
@@ -1959,7 +1959,7 @@
void
gnome_app_create_toolbar_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
GtkCallbackMarshal relay_func, gpointer data,
- GtkDestroyNotify destroy_func)
+ GDestroyNotify destroy_func)
{
GnomeUIBuilderData uibdata;
@@ -2396,7 +2396,7 @@
void
gnome_app_insert_menus_interp (GnomeApp *app, const gchar *path,
GnomeUIInfo *menuinfo, GtkCallbackMarshal relay_func,
- gpointer data, GtkDestroyNotify destroy_func)
+ gpointer data, GDestroyNotify destroy_func)
{
GnomeUIBuilderData uidata =
{
Modified: trunk/libgnomeui/gnome-app-helper.h
==============================================================================
--- trunk/libgnomeui/gnome-app-helper.h (original)
+++ trunk/libgnomeui/gnome-app-helper.h Thu Jun 19 14:26:54 2008
@@ -618,7 +618,7 @@
gpointer data;
gboolean is_interp;
GtkCallbackMarshal relay_func;
- GtkDestroyNotify destroy_func;
+ GDestroyNotify destroy_func;
};
/* Flush the accelerator definitions into the application specific
@@ -685,7 +685,7 @@
*/
void gnome_app_create_menus_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
GtkCallbackMarshal relay_func, gpointer data,
- GtkDestroyNotify destroy_func);
+ GDestroyNotify destroy_func);
/* Constructs a menu bar, sets all the user data pointers to the specified value, and attaches it to
* the specified application window.
@@ -723,7 +723,7 @@
*/
void gnome_app_create_toolbar_interp (GnomeApp *app, GnomeUIInfo *uiinfo,
GtkCallbackMarshal relay_func, gpointer data,
- GtkDestroyNotify destroy_func);
+ GDestroyNotify destroy_func);
/* Constructs a toolbar, sets all the user data pointers to the specified value, and attaches it to
* the specified application window.
@@ -769,7 +769,7 @@
void gnome_app_insert_menus_interp (GnomeApp *app, const gchar *path, GnomeUIInfo *menuinfo,
GtkCallbackMarshal relay_func, gpointer data,
- GtkDestroyNotify destroy_func);
+ GDestroyNotify destroy_func);
/* Activate the menu item hints, displaying in the given appbar.
Modified: trunk/libgnomeui/gnome-app.h
==============================================================================
--- trunk/libgnomeui/gnome-app.h (original)
+++ trunk/libgnomeui/gnome-app.h Thu Jun 19 14:26:54 2008
@@ -48,11 +48,11 @@
#define GNOME_TYPE_APP (gnome_app_get_type ())
-#define GNOME_APP(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_APP, GnomeApp))
-#define GNOME_APP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APP, GnomeAppClass))
-#define GNOME_IS_APP(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_APP))
-#define GNOME_IS_APP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APP))
-#define GNOME_APP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_APP, GnomeAppClass))
+#define GNOME_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_APP, GnomeApp))
+#define GNOME_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APP, GnomeAppClass))
+#define GNOME_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_APP))
+#define GNOME_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APP))
+#define GNOME_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_APP, GnomeAppClass))
typedef struct _GnomeApp GnomeApp;
Modified: trunk/libgnomeui/gnome-appbar.h
==============================================================================
--- trunk/libgnomeui/gnome-appbar.h (original)
+++ trunk/libgnomeui/gnome-appbar.h Thu Jun 19 14:26:54 2008
@@ -35,11 +35,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_APPBAR (gnome_appbar_get_type ())
-#define GNOME_APPBAR(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_APPBAR, GnomeAppBar))
-#define GNOME_APPBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APPBAR, GnomeAppBarClass))
-#define GNOME_IS_APPBAR(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_APPBAR))
-#define GNOME_IS_APPBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APPBAR))
-#define GNOME_APPBAR_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_APPBAR, GnomeAppBarClass))
+#define GNOME_APPBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_APPBAR, GnomeAppBar))
+#define GNOME_APPBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_APPBAR, GnomeAppBarClass))
+#define GNOME_IS_APPBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_APPBAR))
+#define GNOME_IS_APPBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_APPBAR))
+#define GNOME_APPBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_APPBAR, GnomeAppBarClass))
/* Used in gnome-app-util to determine the capabilities of the appbar */
#define GNOME_APPBAR_HAS_STATUS(appbar) (gnome_appbar_get_status(GNOME_APPBAR(appbar)) != NULL)
Modified: trunk/libgnomeui/gnome-client.c
==============================================================================
--- trunk/libgnomeui/gnome-client.c (original)
+++ trunk/libgnomeui/gnome-client.c Thu Jun 19 14:26:54 2008
@@ -121,7 +121,7 @@
gboolean interp;
GnomeInteractFunction function;
gpointer data;
- GtkDestroyNotify destroy;
+ GDestroyNotify destroy;
};
@@ -135,7 +135,7 @@
gboolean interp,
GnomeInteractFunction function,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
static gint tag= 1;
@@ -2518,7 +2518,7 @@
gboolean interp,
GnomeInteractFunction function,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
#ifdef HAVE_LIBSM
Status status;
@@ -2703,7 +2703,7 @@
GnomeDialogType dialog_type,
GtkCallbackMarshal function,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
g_return_if_fail (client != NULL);
g_return_if_fail (GNOME_IS_CLIENT (client));
Modified: trunk/libgnomeui/gnome-client.h
==============================================================================
--- trunk/libgnomeui/gnome-client.h (original)
+++ trunk/libgnomeui/gnome-client.h Thu Jun 19 14:26:54 2008
@@ -35,11 +35,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_CLIENT (gnome_client_get_type ())
-#define GNOME_CLIENT(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_CLIENT, GnomeClient))
-#define GNOME_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CLIENT, GnomeClientClass))
-#define GNOME_IS_CLIENT(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CLIENT))
-#define GNOME_IS_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE (((klass), GNOME_TYPE_CLIENT))
-#define GNOME_CLIENT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_CLIENT, GnomeClientClass))
+#define GNOME_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CLIENT, GnomeClient))
+#define GNOME_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CLIENT, GnomeClientClass))
+#define GNOME_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_CLIENT))
+#define GNOME_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE (((klass), GNOME_TYPE_CLIENT))
+#define GNOME_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_CLIENT, GnomeClientClass))
#define GNOME_CLIENT_CONNECTED(obj) (GNOME_CLIENT (obj)->smc_conn)
@@ -456,7 +456,7 @@
GnomeDialogType dialog_type,
GtkCallbackMarshal function,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
/* 'gnome_interaction_key_return' is used to tell gnome, that you are
finished with interaction */
Modified: trunk/libgnomeui/gnome-color-picker.h
==============================================================================
--- trunk/libgnomeui/gnome-color-picker.h (original)
+++ trunk/libgnomeui/gnome-color-picker.h Thu Jun 19 14:26:54 2008
@@ -46,11 +46,11 @@
*/
#define GNOME_TYPE_COLOR_PICKER (gnome_color_picker_get_type ())
-#define GNOME_COLOR_PICKER(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPicker))
-#define GNOME_COLOR_PICKER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
-#define GNOME_IS_COLOR_PICKER(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_COLOR_PICKER))
-#define GNOME_IS_COLOR_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_COLOR_PICKER))
-#define GNOME_COLOR_PICKER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
+#define GNOME_COLOR_PICKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPicker))
+#define GNOME_COLOR_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
+#define GNOME_IS_COLOR_PICKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_COLOR_PICKER))
+#define GNOME_IS_COLOR_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_COLOR_PICKER))
+#define GNOME_COLOR_PICKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_COLOR_PICKER, GnomeColorPickerClass))
typedef struct _GnomeColorPicker GnomeColorPicker;
Modified: trunk/libgnomeui/gnome-dateedit.c
==============================================================================
--- trunk/libgnomeui/gnome-dateedit.c (original)
+++ trunk/libgnomeui/gnome-dateedit.c Thu Jun 19 14:26:54 2008
@@ -120,7 +120,7 @@
/**
* gnome_date_edit_get_type:
*
- * Returns the GtkType for the GnomeDateEdit widget
+ * Returns the GType for the GnomeDateEdit widget
*/
/* The following macro defines the get_type */
GNOME_CLASS_BOILERPLATE(GnomeDateEdit, gnome_date_edit,
Modified: trunk/libgnomeui/gnome-dateedit.h
==============================================================================
--- trunk/libgnomeui/gnome-dateedit.h (original)
+++ trunk/libgnomeui/gnome-dateedit.h Thu Jun 19 14:26:54 2008
@@ -42,11 +42,11 @@
#define GNOME_TYPE_DATE_EDIT (gnome_date_edit_get_type ())
-#define GNOME_DATE_EDIT(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEdit))
-#define GNOME_DATE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
-#define GNOME_IS_DATE_EDIT(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DATE_EDIT))
-#define GNOME_IS_DATE_EDIT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DATE_EDIT))
-#define GNOME_DATE_EDIT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
+#define GNOME_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEdit))
+#define GNOME_DATE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
+#define GNOME_IS_DATE_EDIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DATE_EDIT))
+#define GNOME_IS_DATE_EDIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DATE_EDIT))
+#define GNOME_DATE_EDIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DATE_EDIT, GnomeDateEditClass))
typedef struct _GnomeDateEdit GnomeDateEdit;
typedef struct _GnomeDateEditPrivate GnomeDateEditPrivate;
Modified: trunk/libgnomeui/gnome-dialog.h
==============================================================================
--- trunk/libgnomeui/gnome-dialog.h (original)
+++ trunk/libgnomeui/gnome-dialog.h Thu Jun 19 14:26:54 2008
@@ -33,11 +33,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_DIALOG (gnome_dialog_get_type ())
-#define GNOME_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DIALOG, GnomeDialog))
-#define GNOME_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DIALOG, GnomeDialogClass))
-#define GNOME_IS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DIALOG))
-#define GNOME_IS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DIALOG))
-#define GNOME_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DIALOG, GnomeDialogClass))
+#define GNOME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DIALOG, GnomeDialog))
+#define GNOME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DIALOG, GnomeDialogClass))
+#define GNOME_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DIALOG))
+#define GNOME_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DIALOG))
+#define GNOME_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DIALOG, GnomeDialogClass))
typedef struct _GnomeDialog GnomeDialog;
typedef struct _GnomeDialogClass GnomeDialogClass;
Modified: trunk/libgnomeui/gnome-druid-page-edge.h
==============================================================================
--- trunk/libgnomeui/gnome-druid-page-edge.h (original)
+++ trunk/libgnomeui/gnome-druid-page-edge.h Thu Jun 19 14:26:54 2008
@@ -33,11 +33,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_DRUID_PAGE_EDGE (gnome_druid_page_edge_get_type ())
-#define GNOME_DRUID_PAGE_EDGE(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdge))
-#define GNOME_DRUID_PAGE_EDGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
-#define GNOME_IS_DRUID_PAGE_EDGE(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DRUID_PAGE_EDGE))
-#define GNOME_IS_DRUID_PAGE_EDGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE_EDGE))
-#define GNOME_DRUID_PAGE_EDGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
+#define GNOME_DRUID_PAGE_EDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdge))
+#define GNOME_DRUID_PAGE_EDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
+#define GNOME_IS_DRUID_PAGE_EDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DRUID_PAGE_EDGE))
+#define GNOME_IS_DRUID_PAGE_EDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE_EDGE))
+#define GNOME_DRUID_PAGE_EDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE_EDGE, GnomeDruidPageEdgeClass))
/**
* GnomeEdgePosition:
Modified: trunk/libgnomeui/gnome-druid-page-standard.h
==============================================================================
--- trunk/libgnomeui/gnome-druid-page-standard.h (original)
+++ trunk/libgnomeui/gnome-druid-page-standard.h Thu Jun 19 14:26:54 2008
@@ -32,11 +32,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_DRUID_PAGE_STANDARD (gnome_druid_page_standard_get_type ())
-#define GNOME_DRUID_PAGE_STANDARD(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DRUID_PAGE_STANDARD, GnomeDruidPageStandard))
-#define GNOME_DRUID_PAGE_STANDARD_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE_STANDARD, GnomeDruidPageStandardClass))
-#define GNOME_IS_DRUID_PAGE_STANDARD(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DRUID_PAGE_STANDARD))
-#define GNOME_IS_DRUID_PAGE_STANDARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE_STANDARD))
-#define GNOME_DRUID_PAGE_STANDARD_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE_STANDARD, GnomeDruidPageStandardClass))
+#define GNOME_DRUID_PAGE_STANDARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DRUID_PAGE_STANDARD, GnomeDruidPageStandard))
+#define GNOME_DRUID_PAGE_STANDARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE_STANDARD, GnomeDruidPageStandardClass))
+#define GNOME_IS_DRUID_PAGE_STANDARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DRUID_PAGE_STANDARD))
+#define GNOME_IS_DRUID_PAGE_STANDARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE_STANDARD))
+#define GNOME_DRUID_PAGE_STANDARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE_STANDARD, GnomeDruidPageStandardClass))
typedef struct _GnomeDruidPageStandard GnomeDruidPageStandard;
Modified: trunk/libgnomeui/gnome-druid-page.h
==============================================================================
--- trunk/libgnomeui/gnome-druid-page.h (original)
+++ trunk/libgnomeui/gnome-druid-page.h Thu Jun 19 14:26:54 2008
@@ -32,11 +32,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_DRUID_PAGE (gnome_druid_page_get_type ())
-#define GNOME_DRUID_PAGE(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DRUID_PAGE, GnomeDruidPage))
-#define GNOME_DRUID_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE, GnomeDruidPageClass))
-#define GNOME_IS_DRUID_PAGE(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DRUID_PAGE))
-#define GNOME_IS_DRUID_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE))
-#define GNOME_DRUID_PAGE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE, GnomeDruidPageClass))
+#define GNOME_DRUID_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DRUID_PAGE, GnomeDruidPage))
+#define GNOME_DRUID_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID_PAGE, GnomeDruidPageClass))
+#define GNOME_IS_DRUID_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DRUID_PAGE))
+#define GNOME_IS_DRUID_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID_PAGE))
+#define GNOME_DRUID_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DRUID_PAGE, GnomeDruidPageClass))
typedef struct _GnomeDruidPage GnomeDruidPage;
Modified: trunk/libgnomeui/gnome-druid.c
==============================================================================
--- trunk/libgnomeui/gnome-druid.c (original)
+++ trunk/libgnomeui/gnome-druid.c Thu Jun 19 14:26:54 2008
@@ -71,7 +71,7 @@
GdkEventExpose *event);
static void gnome_druid_map (GtkWidget *widget);
static void gnome_druid_unmap (GtkWidget *widget);
-static GtkType gnome_druid_child_type (GtkContainer *container);
+static GType gnome_druid_child_type (GtkContainer *container);
static void gnome_druid_add (GtkContainer *widget,
GtkWidget *page);
static void gnome_druid_remove (GtkContainer *widget,
@@ -479,7 +479,7 @@
}
}
-static GtkType
+static GType
gnome_druid_child_type (GtkContainer *container)
{
return GNOME_TYPE_DRUID_PAGE;
Modified: trunk/libgnomeui/gnome-druid.h
==============================================================================
--- trunk/libgnomeui/gnome-druid.h (original)
+++ trunk/libgnomeui/gnome-druid.h Thu Jun 19 14:26:54 2008
@@ -33,11 +33,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_DRUID (gnome_druid_get_type ())
-#define GNOME_DRUID(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_DRUID, GnomeDruid))
-#define GNOME_DRUID_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID, GnomeDruidClass))
-#define GNOME_IS_DRUID(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_DRUID))
-#define GNOME_IS_DRUID_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID))
-#define GNOME_DRUID_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_DRUID, GnomeDruidClass))
+#define GNOME_DRUID(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_DRUID, GnomeDruid))
+#define GNOME_DRUID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_DRUID, GnomeDruidClass))
+#define GNOME_IS_DRUID(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_DRUID))
+#define GNOME_IS_DRUID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_DRUID))
+#define GNOME_DRUID_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_DRUID, GnomeDruidClass))
typedef struct _GnomeDruid GnomeDruid;
Modified: trunk/libgnomeui/gnome-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-entry.h (original)
+++ trunk/libgnomeui/gnome-entry.h Thu Jun 19 14:26:54 2008
@@ -40,11 +40,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_ENTRY (gnome_entry_get_type ())
-#define GNOME_ENTRY(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_ENTRY, GnomeEntry))
-#define GNOME_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ENTRY, GnomeEntryClass))
-#define GNOME_IS_ENTRY(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_ENTRY))
-#define GNOME_IS_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ENTRY))
-#define GNOME_ENTRY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_ENTRY, GnomeEntryClass))
+#define GNOME_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_ENTRY, GnomeEntry))
+#define GNOME_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ENTRY, GnomeEntryClass))
+#define GNOME_IS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_ENTRY))
+#define GNOME_IS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ENTRY))
+#define GNOME_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_ENTRY, GnomeEntryClass))
/* This also supports the GtkEditable interface so
* to get text use the gtk_editable_get_chars method
Modified: trunk/libgnomeui/gnome-file-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-file-entry.h (original)
+++ trunk/libgnomeui/gnome-file-entry.h Thu Jun 19 14:26:54 2008
@@ -44,11 +44,11 @@
#define GNOME_TYPE_FILE_ENTRY (gnome_file_entry_get_type ())
-#define GNOME_FILE_ENTRY(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_FILE_ENTRY, GnomeFileEntry))
-#define GNOME_FILE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_FILE_ENTRY, GnomeFileEntryClass))
-#define GNOME_IS_FILE_ENTRY(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_FILE_ENTRY))
-#define GNOME_IS_FILE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_FILE_ENTRY))
-#define GNOME_FILE_ENTRY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_FILE_ENTRY, GnomeFileEntryClass))
+#define GNOME_FILE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_FILE_ENTRY, GnomeFileEntry))
+#define GNOME_FILE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_FILE_ENTRY, GnomeFileEntryClass))
+#define GNOME_IS_FILE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_FILE_ENTRY))
+#define GNOME_IS_FILE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_FILE_ENTRY))
+#define GNOME_FILE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_FILE_ENTRY, GnomeFileEntryClass))
/* Note: This supports GtkEditable interface */
Modified: trunk/libgnomeui/gnome-font-picker.h
==============================================================================
--- trunk/libgnomeui/gnome-font-picker.h (original)
+++ trunk/libgnomeui/gnome-font-picker.h Thu Jun 19 14:26:54 2008
@@ -39,11 +39,11 @@
} GnomeFontPickerMode;
#define GNOME_TYPE_FONT_PICKER (gnome_font_picker_get_type ())
-#define GNOME_FONT_PICKER(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_FONT_PICKER, GnomeFontPicker))
-#define GNOME_FONT_PICKER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_FONT_PICKER, GnomeFontPickerClass))
-#define GNOME_IS_FONT_PICKER(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_FONT_PICKER))
-#define GNOME_IS_FONT_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_FONT_PICKER))
-#define GNOME_FONT_PICKER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_FONT_PICKER, GnomeFontPickerClass))
+#define GNOME_FONT_PICKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_FONT_PICKER, GnomeFontPicker))
+#define GNOME_FONT_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_FONT_PICKER, GnomeFontPickerClass))
+#define GNOME_IS_FONT_PICKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_FONT_PICKER))
+#define GNOME_IS_FONT_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_FONT_PICKER))
+#define GNOME_FONT_PICKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_FONT_PICKER, GnomeFontPickerClass))
typedef struct _GnomeFontPicker GnomeFontPicker;
typedef struct _GnomeFontPickerPrivate GnomeFontPickerPrivate;
Modified: trunk/libgnomeui/gnome-href.h
==============================================================================
--- trunk/libgnomeui/gnome-href.h (original)
+++ trunk/libgnomeui/gnome-href.h Thu Jun 19 14:26:54 2008
@@ -32,11 +32,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_HREF (gnome_href_get_type ())
-#define GNOME_HREF(obj) (GTK_CHECK_CAST((obj), GNOME_TYPE_HREF, GnomeHRef))
-#define GNOME_HREF_CLASS(klass) (GTK_CHECK_CLASS_CAST((klass), GNOME_TYPE_HREF, GnomeHRefClass))
-#define GNOME_IS_HREF(obj) (GTK_CHECK_TYPE((obj), GNOME_TYPE_HREF))
-#define GNOME_IS_HREF_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_HREF))
-#define GNOME_HREF_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_HREF, GnomeHRefClass))
+#define GNOME_HREF(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNOME_TYPE_HREF, GnomeHRef))
+#define GNOME_HREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNOME_TYPE_HREF, GnomeHRefClass))
+#define GNOME_IS_HREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNOME_TYPE_HREF))
+#define GNOME_IS_HREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_HREF))
+#define GNOME_HREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_HREF, GnomeHRefClass))
typedef struct _GnomeHRef GnomeHRef;
typedef struct _GnomeHRefPrivate GnomeHRefPrivate;
Modified: trunk/libgnomeui/gnome-icon-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-entry.h (original)
+++ trunk/libgnomeui/gnome-icon-entry.h Thu Jun 19 14:26:54 2008
@@ -47,11 +47,11 @@
#define GNOME_TYPE_ICON_ENTRY (gnome_icon_entry_get_type ())
-#define GNOME_ICON_ENTRY(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_ICON_ENTRY, GnomeIconEntry))
-#define GNOME_ICON_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_ENTRY, GnomeIconEntryClass))
-#define GNOME_IS_ICON_ENTRY(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_ICON_ENTRY))
-#define GNOME_IS_ICON_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_ENTRY))
-#define GNOME_ICON_ENTRY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_ICON_ENTRY, GnomeIconEntryClass))
+#define GNOME_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_ICON_ENTRY, GnomeIconEntry))
+#define GNOME_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_ENTRY, GnomeIconEntryClass))
+#define GNOME_IS_ICON_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_ICON_ENTRY))
+#define GNOME_IS_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_ENTRY))
+#define GNOME_ICON_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_ICON_ENTRY, GnomeIconEntryClass))
typedef struct _GnomeIconEntry GnomeIconEntry;
Modified: trunk/libgnomeui/gnome-icon-item.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-item.h (original)
+++ trunk/libgnomeui/gnome-icon-item.h Thu Jun 19 14:26:54 2008
@@ -40,11 +40,11 @@
typedef struct _GnomeIconTextItemPrivate GnomeIconTextItemPrivate;
#define GNOME_TYPE_ICON_TEXT_ITEM (gnome_icon_text_item_get_type ())
-#define GNOME_ICON_TEXT_ITEM(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_ICON_TEXT_ITEM, GnomeIconTextItem))
-#define GNOME_ICON_TEXT_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_TEXT_ITEM, GnomeIconTextItemClass))
-#define GNOME_IS_ICON_TEXT_ITEM(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_ICON_TEXT_ITEM))
-#define GNOME_IS_ICON_TEXT_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_TEXT_ITEM))
-#define GNOME_ICON_TEXT_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_ICON_TEXT_ITEM, GnomeIconTextItemClass))
+#define GNOME_ICON_TEXT_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_ICON_TEXT_ITEM, GnomeIconTextItem))
+#define GNOME_ICON_TEXT_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_TEXT_ITEM, GnomeIconTextItemClass))
+#define GNOME_IS_ICON_TEXT_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_ICON_TEXT_ITEM))
+#define GNOME_IS_ICON_TEXT_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_TEXT_ITEM))
+#define GNOME_ICON_TEXT_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_ICON_TEXT_ITEM, GnomeIconTextItemClass))
struct _GnomeIconTextItem {
GnomeCanvasItem parent_instance;
Modified: trunk/libgnomeui/gnome-icon-list.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-list.h (original)
+++ trunk/libgnomeui/gnome-icon-list.h Thu Jun 19 14:26:54 2008
@@ -46,11 +46,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_ICON_LIST (gnome_icon_list_get_type ())
-#define GNOME_ICON_LIST(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_ICON_LIST, GnomeIconList))
-#define GNOME_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_LIST, GnomeIconListClass))
-#define GNOME_IS_ICON_LIST(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_ICON_LIST))
-#define GNOME_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_LIST))
-#define GNOME_ICON_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_ICON_LIST, GnomeIconListClass))
+#define GNOME_ICON_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_ICON_LIST, GnomeIconList))
+#define GNOME_ICON_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_LIST, GnomeIconListClass))
+#define GNOME_IS_ICON_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_ICON_LIST))
+#define GNOME_IS_ICON_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_LIST))
+#define GNOME_ICON_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_ICON_LIST, GnomeIconListClass))
typedef struct _GnomeIconList GnomeIconList;
typedef struct _GnomeIconListPrivate GnomeIconListPrivate;
Modified: trunk/libgnomeui/gnome-icon-sel.h
==============================================================================
--- trunk/libgnomeui/gnome-icon-sel.h (original)
+++ trunk/libgnomeui/gnome-icon-sel.h Thu Jun 19 14:26:54 2008
@@ -35,11 +35,11 @@
typedef struct _GnomeIconSelectionClass GnomeIconSelectionClass;
#define GNOME_TYPE_ICON_SELECTION (gnome_icon_selection_get_type ())
-#define GNOME_ICON_SELECTION(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_ICON_SELECTION, GnomeIconSelection))
-#define GNOME_ICON_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_SELECTION, GnomeIconSelectionClass))
-#define GNOME_IS_ICON_SELECTION(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_ICON_SELECTION))
-#define GNOME_IS_ICON_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_SELECTION))
-#define GNOME_ICON_SELECTION_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_ICON_SELECTION, GnomeIconSelectionClass))
+#define GNOME_ICON_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_ICON_SELECTION, GnomeIconSelection))
+#define GNOME_ICON_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_ICON_SELECTION, GnomeIconSelectionClass))
+#define GNOME_IS_ICON_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_ICON_SELECTION))
+#define GNOME_IS_ICON_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_ICON_SELECTION))
+#define GNOME_ICON_SELECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_ICON_SELECTION, GnomeIconSelectionClass))
struct _GnomeIconSelection {
GtkVBox vbox;
Modified: trunk/libgnomeui/gnome-mdi-child.h
==============================================================================
--- trunk/libgnomeui/gnome-mdi-child.h (original)
+++ trunk/libgnomeui/gnome-mdi-child.h Thu Jun 19 14:26:54 2008
@@ -35,11 +35,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_MDI_CHILD (gnome_mdi_child_get_type ())
-#define GNOME_MDI_CHILD(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_MDI_CHILD, GnomeMDIChild))
-#define GNOME_MDI_CHILD_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MDI_CHILD, GnomeMDIChildClass))
-#define GNOME_IS_MDI_CHILD(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_MDI_CHILD))
-#define GNOME_IS_MDI_CHILD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MDI_CHILD))
-#define GNOME_MDI_CHILD_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_MDI_CHILD, GnomeMDIChildClass))
+#define GNOME_MDI_CHILD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_MDI_CHILD, GnomeMDIChild))
+#define GNOME_MDI_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MDI_CHILD, GnomeMDIChildClass))
+#define GNOME_IS_MDI_CHILD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_MDI_CHILD))
+#define GNOME_IS_MDI_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MDI_CHILD))
+#define GNOME_MDI_CHILD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_MDI_CHILD, GnomeMDIChildClass))
typedef struct _GnomeMDIChild GnomeMDIChild;
typedef struct _GnomeMDIChildClass GnomeMDIChildClass;
Modified: trunk/libgnomeui/gnome-mdi-generic-child.c
==============================================================================
--- trunk/libgnomeui/gnome-mdi-generic-child.c (original)
+++ trunk/libgnomeui/gnome-mdi-generic-child.c Thu Jun 19 14:26:54 2008
@@ -150,7 +150,7 @@
GnomeMDIChildViewCreator func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify)
+ GDestroyNotify notify)
{
if(child->create_view_dn)
child->create_view_dn(child->create_view_data);
@@ -198,7 +198,7 @@
GnomeMDIChildMenuCreator func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify)
+ GDestroyNotify notify)
{
if(child->create_menus_dn)
child->create_menus_dn(child->create_menus_data);
@@ -243,7 +243,7 @@
GnomeMDIChildConfigFunc func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify)
+ GDestroyNotify notify)
{
if(child->get_config_string_dn)
child->get_config_string_dn(child->get_config_string_data);
@@ -292,7 +292,7 @@
GnomeMDIChildLabelFunc func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify)
+ GDestroyNotify notify)
{
if(child->set_label_dn)
child->set_label_dn(child->set_label_data);
Modified: trunk/libgnomeui/gnome-mdi-generic-child.h
==============================================================================
--- trunk/libgnomeui/gnome-mdi-generic-child.h (original)
+++ trunk/libgnomeui/gnome-mdi-generic-child.h Thu Jun 19 14:26:54 2008
@@ -35,11 +35,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_MDI_GENERIC_CHILD (gnome_mdi_generic_child_get_type ())
-#define GNOME_MDI_GENERIC_CHILD(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_MDI_GENERIC_CHILD, GnomeMDIGenericChild))
-#define GNOME_MDI_GENERIC_CHILD_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MDI_GENERIC_CHILD, GnomeMDIGenericChildClass))
-#define GNOME_IS_MDI_GENERIC_CHILD(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_MDI_GENERIC_CHILD))
-#define GNOME_IS_MDI_GENERIC_CHILD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MDI_GENERIC_CHILD))
-#define GNOME_MDI_GENERIC_CHILD_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_MDI_GENERIC_CHILD, GnomeMDIGenericChildClass))
+#define GNOME_MDI_GENERIC_CHILD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_MDI_GENERIC_CHILD, GnomeMDIGenericChild))
+#define GNOME_MDI_GENERIC_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MDI_GENERIC_CHILD, GnomeMDIGenericChildClass))
+#define GNOME_IS_MDI_GENERIC_CHILD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_MDI_GENERIC_CHILD))
+#define GNOME_IS_MDI_GENERIC_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MDI_GENERIC_CHILD))
+#define GNOME_MDI_GENERIC_CHILD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_MDI_GENERIC_CHILD, GnomeMDIGenericChildClass))
/* The source backward-compatibility macro GNOME_IS_MDI_MDI_CHILD(obj)
is in gnome-compat.h. */
@@ -59,7 +59,7 @@
GtkCallbackMarshal create_view_cbm, create_menus_cbm,
get_config_string_cbm, set_label_cbm;
- GtkDestroyNotify create_view_dn, create_menus_dn,
+ GDestroyNotify create_view_dn, create_menus_dn,
get_config_string_dn, set_label_dn;
gpointer create_view_data, create_menus_data,
get_config_string_data, set_label_data;
@@ -82,7 +82,7 @@
GnomeMDIChildViewCreator func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify);
+ GDestroyNotify notify);
void gnome_mdi_generic_child_set_menu_creator (GnomeMDIGenericChild *child,
GnomeMDIChildMenuCreator func,
gpointer data);
@@ -90,7 +90,7 @@
GnomeMDIChildMenuCreator func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify);
+ GDestroyNotify notify);
void gnome_mdi_generic_child_set_config_func (GnomeMDIGenericChild *child,
GnomeMDIChildConfigFunc func,
gpointer data);
@@ -98,7 +98,7 @@
GnomeMDIChildConfigFunc func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify);
+ GDestroyNotify notify);
void gnome_mdi_generic_child_set_label_func (GnomeMDIGenericChild *child,
GnomeMDIChildLabelFunc func,
gpointer data);
@@ -106,7 +106,7 @@
GnomeMDIChildLabelFunc func,
GtkCallbackMarshal marshal,
gpointer data,
- GtkDestroyNotify notify);
+ GDestroyNotify notify);
G_END_DECLS
Modified: trunk/libgnomeui/gnome-mdi.h
==============================================================================
--- trunk/libgnomeui/gnome-mdi.h (original)
+++ trunk/libgnomeui/gnome-mdi.h Thu Jun 19 14:26:54 2008
@@ -36,11 +36,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_MDI (gnome_mdi_get_type ())
-#define GNOME_MDI(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_MDI, GnomeMDI))
-#define GNOME_MDI_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MDI, GnomeMDIClass))
-#define GNOME_IS_MDI(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_MDI))
-#define GNOME_IS_MDI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MDI))
-#define GNOME_MDI_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_MDI, GnomeMDIClass))
+#define GNOME_MDI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_MDI, GnomeMDI))
+#define GNOME_MDI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MDI, GnomeMDIClass))
+#define GNOME_IS_MDI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_MDI))
+#define GNOME_IS_MDI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MDI))
+#define GNOME_MDI_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_MDI, GnomeMDIClass))
typedef struct _GnomeMDI GnomeMDI;
typedef struct _GnomeMDIClass GnomeMDIClass;
Modified: trunk/libgnomeui/gnome-messagebox.h
==============================================================================
--- trunk/libgnomeui/gnome-messagebox.h (original)
+++ trunk/libgnomeui/gnome-messagebox.h Thu Jun 19 14:26:54 2008
@@ -29,11 +29,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_MESSAGE_BOX (gnome_message_box_get_type ())
-#define GNOME_MESSAGE_BOX(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_MESSAGE_BOX, GnomeMessageBox))
-#define GNOME_MESSAGE_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MESSAGE_BOX, GnomeMessageBoxClass))
-#define GNOME_IS_MESSAGE_BOX(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_MESSAGE_BOX))
-#define GNOME_IS_MESSAGE_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MESSAGE_BOX))
-#define GNOME_MESSAGE_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_MESSAGE_BOX, GnomeMessageBoxClass))
+#define GNOME_MESSAGE_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_MESSAGE_BOX, GnomeMessageBox))
+#define GNOME_MESSAGE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MESSAGE_BOX, GnomeMessageBoxClass))
+#define GNOME_IS_MESSAGE_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_MESSAGE_BOX))
+#define GNOME_IS_MESSAGE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MESSAGE_BOX))
+#define GNOME_MESSAGE_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_MESSAGE_BOX, GnomeMessageBoxClass))
#define GNOME_MESSAGE_BOX_INFO "info"
Modified: trunk/libgnomeui/gnome-password-dialog.h
==============================================================================
--- trunk/libgnomeui/gnome-password-dialog.h (original)
+++ trunk/libgnomeui/gnome-password-dialog.h Thu Jun 19 14:26:54 2008
@@ -30,10 +30,10 @@
G_BEGIN_DECLS
#define GNOME_TYPE_PASSWORD_DIALOG (gnome_password_dialog_get_type ())
-#define GNOME_PASSWORD_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_PASSWORD_DIALOG, GnomePasswordDialog))
-#define GNOME_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PASSWORD_DIALOG, GnomePasswordDialogClass))
-#define GNOME_IS_PASSWORD_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_PASSWORD_DIALOG))
-#define GNOME_IS_PASSWORD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PASSWORD_DIALOG))
+#define GNOME_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_PASSWORD_DIALOG, GnomePasswordDialog))
+#define GNOME_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PASSWORD_DIALOG, GnomePasswordDialogClass))
+#define GNOME_IS_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_PASSWORD_DIALOG))
+#define GNOME_IS_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PASSWORD_DIALOG))
typedef struct _GnomePasswordDialog GnomePasswordDialog;
typedef struct _GnomePasswordDialogClass GnomePasswordDialogClass;
@@ -61,7 +61,7 @@
const char *password,
gpointer user_data);
-GtkType gnome_password_dialog_get_type (void);
+GType gnome_password_dialog_get_type (void);
GtkWidget* gnome_password_dialog_new (const char *dialog_title,
const char *message,
const char *username,
Modified: trunk/libgnomeui/gnome-pixmap-entry.h
==============================================================================
--- trunk/libgnomeui/gnome-pixmap-entry.h (original)
+++ trunk/libgnomeui/gnome-pixmap-entry.h Thu Jun 19 14:26:54 2008
@@ -43,11 +43,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_PIXMAP_ENTRY (gnome_pixmap_entry_get_type ())
-#define GNOME_PIXMAP_ENTRY(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_PIXMAP_ENTRY, GnomePixmapEntry))
-#define GNOME_PIXMAP_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PIXMAP_ENTRY, GnomePixmapEntryClass))
-#define GNOME_IS_PIXMAP_ENTRY(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_PIXMAP_ENTRY))
-#define GNOME_IS_PIXMAP_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PIXMAP_ENTRY))
-#define GNOME_PIXMAP_ENTRY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_PIXMAP_ENTRY, GnomePixmapEntryClass))
+#define GNOME_PIXMAP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_PIXMAP_ENTRY, GnomePixmapEntry))
+#define GNOME_PIXMAP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PIXMAP_ENTRY, GnomePixmapEntryClass))
+#define GNOME_IS_PIXMAP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_PIXMAP_ENTRY))
+#define GNOME_IS_PIXMAP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PIXMAP_ENTRY))
+#define GNOME_PIXMAP_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_PIXMAP_ENTRY, GnomePixmapEntryClass))
/* Note: This derives from GnomeFileEntry and thus supports GtkEditable
* interface */
Modified: trunk/libgnomeui/gnome-pixmap.h
==============================================================================
--- trunk/libgnomeui/gnome-pixmap.h (original)
+++ trunk/libgnomeui/gnome-pixmap.h Thu Jun 19 14:26:54 2008
@@ -41,11 +41,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_PIXMAP (gnome_pixmap_get_type ())
-#define GNOME_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_PIXMAP, GnomePixmap))
-#define GNOME_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PIXMAP, GnomePixmapClass))
-#define GNOME_IS_PIXMAP(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_PIXMAP))
-#define GNOME_IS_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PIXMAP))
-#define GNOME_PIXMAP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_PIXMAP, GnomePixmapClass))
+#define GNOME_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_PIXMAP, GnomePixmap))
+#define GNOME_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PIXMAP, GnomePixmapClass))
+#define GNOME_IS_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_PIXMAP))
+#define GNOME_IS_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PIXMAP))
+#define GNOME_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_PIXMAP, GnomePixmapClass))
/* Note:
* You should use GtkImage if you can, this is just a compatibility wrapper to get
Modified: trunk/libgnomeui/gnome-propertybox.h
==============================================================================
--- trunk/libgnomeui/gnome-propertybox.h (original)
+++ trunk/libgnomeui/gnome-propertybox.h Thu Jun 19 14:26:54 2008
@@ -31,11 +31,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_PROPERTY_BOX (gnome_property_box_get_type ())
-#define GNOME_PROPERTY_BOX(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_PROPERTY_BOX, GnomePropertyBox))
-#define GNOME_PROPERTY_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROPERTY_BOX, GnomePropertyBoxClass))
-#define GNOME_IS_PROPERTY_BOX(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_PROPERTY_BOX))
-#define GNOME_IS_PROPERTY_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PROPERTY_BOX))
-#define GNOME_PROPERTY_BOX_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_PROPERTY_BOX, GnomePropertyBoxClass))
+#define GNOME_PROPERTY_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_PROPERTY_BOX, GnomePropertyBox))
+#define GNOME_PROPERTY_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROPERTY_BOX, GnomePropertyBoxClass))
+#define GNOME_IS_PROPERTY_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_PROPERTY_BOX))
+#define GNOME_IS_PROPERTY_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_PROPERTY_BOX))
+#define GNOME_PROPERTY_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_PROPERTY_BOX, GnomePropertyBoxClass))
/*the flag used on the notebook pages to see if a change happened on a certain page or not*/
#define GNOME_PROPERTY_BOX_DIRTY "gnome_property_box_dirty"
Modified: trunk/libgnomeui/gnome-scores.c
==============================================================================
--- trunk/libgnomeui/gnome-scores.c (original)
+++ trunk/libgnomeui/gnome-scores.c Thu Jun 19 14:26:54 2008
@@ -62,7 +62,7 @@
/**
* gnome_scores_get_type:
*
- * Returns the GtkType for the GnomeScores widget
+ * Returns the GType for the GnomeScores widget
*/
GNOME_CLASS_BOILERPLATE (GnomeScores, gnome_scores,
GtkDialog, GTK_TYPE_DIALOG)
Modified: trunk/libgnomeui/gnome-scores.h
==============================================================================
--- trunk/libgnomeui/gnome-scores.h (original)
+++ trunk/libgnomeui/gnome-scores.h Thu Jun 19 14:26:54 2008
@@ -54,11 +54,11 @@
G_BEGIN_DECLS
#define GNOME_TYPE_SCORES (gnome_scores_get_type ())
-#define GNOME_SCORES(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_SCORES, GnomeScores))
-#define GNOME_SCORES_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCORES, GnomeScoresClass))
-#define GNOME_IS_SCORES(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_SCORES))
-#define GNOME_IS_SCORES_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCORES))
-#define GNOME_SCORES_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GNOME_TYPE_SCORES, GnomeScoresClass))
+#define GNOME_SCORES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_SCORES, GnomeScores))
+#define GNOME_SCORES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_SCORES, GnomeScoresClass))
+#define GNOME_IS_SCORES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_SCORES))
+#define GNOME_IS_SCORES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_SCORES))
+#define GNOME_SCORES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_SCORES, GnomeScoresClass))
typedef struct _GnomeScores GnomeScores;
typedef struct _GnomeScoresPrivate GnomeScoresPrivate;
Modified: trunk/libgnomeui/gnometypebuiltins_vars.c
==============================================================================
--- trunk/libgnomeui/gnometypebuiltins_vars.c (original)
+++ trunk/libgnomeui/gnometypebuiltins_vars.c Thu Jun 19 14:26:54 2008
@@ -1,28 +1,28 @@
/* type variables, generated by maketypes.awk */
-GtkType GTK_TYPE_GNOME_UI_INFO_TYPE = 0;
-GtkType GTK_TYPE_GNOME_UI_INFO_CONFIGURABLE_TYPES = 0;
-GtkType GTK_TYPE_GNOME_UI_PIXMAP_TYPE = 0;
-GtkType GTK_TYPE_GNOME_CALCULATOR_MODE = 0;
-GtkType GTK_TYPE_GNOME_INTERACT_STYLE = 0;
-GtkType GTK_TYPE_GNOME_DIALOG_TYPE = 0;
-GtkType GTK_TYPE_GNOME_SAVE_STYLE = 0;
-GtkType GTK_TYPE_GNOME_RESTART_STYLE = 0;
-GtkType GTK_TYPE_GNOME_CLIENT_STATE = 0;
-GtkType GTK_TYPE_GNOME_CLIENT_FLAGS = 0;
-GtkType GTK_TYPE_GNOME_DATE_EDIT_FLAGS = 0;
-GtkType GTK_TYPE_GNOME_DOCK_PLACEMENT = 0;
-GtkType GTK_TYPE_GNOME_DOCK_ITEM_BEHAVIOR = 0;
-GtkType GTK_TYPE_GNOME_EDGE_POSITION = 0;
-GtkType GTK_TYPE_GNOME_FONT_PICKER_MODE = 0;
-GtkType GTK_TYPE_GNOME_HELP_VIEW_STYLE = 0;
-GtkType GTK_TYPE_GNOME_MDI_MODE = 0;
-GtkType GTK_TYPE_GNOME_PIXMAP_DRAW = 0;
-GtkType GTK_TYPE_GNOME_PREFERENCES_TYPE = 0;
-GtkType GTK_TYPE_GNOME_WIN_LAYER = 0;
-GtkType GTK_TYPE_GNOME_WIN_STATE = 0;
-GtkType GTK_TYPE_GNOME_WIN_HINTS = 0;
-GtkType GTK_TYPE_GNOME_WIN_APP_STATE = 0;
-GtkType GTK_TYPE_CLOCK_TYPE = 0;
-GtkType GTK_TYPE_GDK_IMLIB_IMAGE = 0;
-GtkType GTK_TYPE_GNOME_CANVAS_POINTS = 0;
+GType GTK_TYPE_GNOME_UI_INFO_TYPE = 0;
+GType GTK_TYPE_GNOME_UI_INFO_CONFIGURABLE_TYPES = 0;
+GType GTK_TYPE_GNOME_UI_PIXMAP_TYPE = 0;
+GType GTK_TYPE_GNOME_CALCULATOR_MODE = 0;
+GType GTK_TYPE_GNOME_INTERACT_STYLE = 0;
+GType GTK_TYPE_GNOME_DIALOG_TYPE = 0;
+GType GTK_TYPE_GNOME_SAVE_STYLE = 0;
+GType GTK_TYPE_GNOME_RESTART_STYLE = 0;
+GType GTK_TYPE_GNOME_CLIENT_STATE = 0;
+GType GTK_TYPE_GNOME_CLIENT_FLAGS = 0;
+GType GTK_TYPE_GNOME_DATE_EDIT_FLAGS = 0;
+GType GTK_TYPE_GNOME_DOCK_PLACEMENT = 0;
+GType GTK_TYPE_GNOME_DOCK_ITEM_BEHAVIOR = 0;
+GType GTK_TYPE_GNOME_EDGE_POSITION = 0;
+GType GTK_TYPE_GNOME_FONT_PICKER_MODE = 0;
+GType GTK_TYPE_GNOME_HELP_VIEW_STYLE = 0;
+GType GTK_TYPE_GNOME_MDI_MODE = 0;
+GType GTK_TYPE_GNOME_PIXMAP_DRAW = 0;
+GType GTK_TYPE_GNOME_PREFERENCES_TYPE = 0;
+GType GTK_TYPE_GNOME_WIN_LAYER = 0;
+GType GTK_TYPE_GNOME_WIN_STATE = 0;
+GType GTK_TYPE_GNOME_WIN_HINTS = 0;
+GType GTK_TYPE_GNOME_WIN_APP_STATE = 0;
+GType GTK_TYPE_CLOCK_TYPE = 0;
+GType GTK_TYPE_GDK_IMLIB_IMAGE = 0;
+GType GTK_TYPE_GNOME_CANVAS_POINTS = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
