libegg r884 - in trunk: . libegg/column-chooser libegg/combo-old libegg/datetime libegg/dock libegg/iconlist libegg/menu libegg/recent-files libegg/toolbar libegg/treeviewutils
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: libegg r884 - in trunk: . libegg/column-chooser libegg/combo-old libegg/datetime libegg/dock libegg/iconlist libegg/menu libegg/recent-files libegg/toolbar libegg/treeviewutils
- Date: Fri, 20 Jun 2008 14:07:51 +0000 (UTC)
Author: chpe
Date: Fri Jun 20 14:07:51 2008
New Revision: 884
URL: http://svn.gnome.org/viewvc/libegg?rev=884&view=rev
Log:
* libegg/column-chooser/eggcolumnchooserdialog.c:
(egg_column_chooser_dialog_get_type):
* libegg/column-chooser/eggcolumnchooserdialog.h:
* libegg/combo-old/eggentry.c: (egg_entry_get_type),
(egg_entry_enable_completion):
* libegg/combo-old/eggentry.h:
* libegg/datetime/egg-datetime.c: (egg_datetime_get_type):
* libegg/datetime/egg-datetime.h:
* libegg/dock/egg-dock-item-grip.h:
* libegg/dock/egg-dock-item.c:
* libegg/dock/egg-dock-item.h:
* libegg/dock/egg-dock-layout.h:
* libegg/dock/egg-dock-master.h:
* libegg/dock/egg-dock-notebook.h:
* libegg/dock/egg-dock-object.h:
* libegg/dock/egg-dock-paned.h:
* libegg/dock/egg-dock-placeholder.h:
* libegg/dock/egg-dock-tablabel.h:
* libegg/dock/egg-dock.c:
* libegg/dock/egg-dock.h:
* libegg/iconlist/eggiconlist.h:
* libegg/menu/egg-accel-dialog.c: (egg_accel_dialog_get_type):
* libegg/menu/egg-action.c: (egg_action_get_type):
* libegg/menu/egg-menu-merge.c: (egg_menu_merge_get_type):
* libegg/menu/egg-radio-action.c: (egg_radio_action_get_type):
* libegg/menu/egg-toggle-action.c: (egg_toggle_action_get_type):
* libegg/recent-files/egg-recent-view.c:
(egg_recent_view_get_type):
* libegg/recent-files/egg-recent-view.h:
* libegg/toolbar/eggtoolbar.c: (egg_toolbar_get_type):
* libegg/toolbar/eggtoolbutton.c: (egg_tool_button_get_type):
* libegg/toolbar/eggtoolitem.c: (egg_tool_item_get_type):
* libegg/treeviewutils/egg-cell-renderer-text.h:
* libegg/treeviewutils/eggcellrendererkeys.h:
* libegg/treeviewutils/eggtreemodelfilter.c:
(egg_tree_model_filter_set_visible_func),
(egg_tree_model_filter_set_modify_func):
* libegg/treeviewutils/eggtreemodelfilter.h: Use nondeprecated
GType/G_TYPE_* macros instead of the deprecated gtk ones.
Modified:
trunk/ChangeLog
trunk/libegg/column-chooser/eggcolumnchooserdialog.c
trunk/libegg/column-chooser/eggcolumnchooserdialog.h
trunk/libegg/combo-old/eggentry.c
trunk/libegg/combo-old/eggentry.h
trunk/libegg/datetime/egg-datetime.c
trunk/libegg/datetime/egg-datetime.h
trunk/libegg/dock/egg-dock-item-grip.h
trunk/libegg/dock/egg-dock-item.c
trunk/libegg/dock/egg-dock-item.h
trunk/libegg/dock/egg-dock-layout.h
trunk/libegg/dock/egg-dock-master.h
trunk/libegg/dock/egg-dock-notebook.h
trunk/libegg/dock/egg-dock-object.h
trunk/libegg/dock/egg-dock-paned.h
trunk/libegg/dock/egg-dock-placeholder.h
trunk/libegg/dock/egg-dock-tablabel.h
trunk/libegg/dock/egg-dock.c
trunk/libegg/dock/egg-dock.h
trunk/libegg/iconlist/eggiconlist.h
trunk/libegg/menu/egg-accel-dialog.c
trunk/libegg/menu/egg-action.c
trunk/libegg/menu/egg-menu-merge.c
trunk/libegg/menu/egg-radio-action.c
trunk/libegg/menu/egg-toggle-action.c
trunk/libegg/recent-files/egg-recent-view.c
trunk/libegg/recent-files/egg-recent-view.h
trunk/libegg/toolbar/eggtoolbar.c
trunk/libegg/toolbar/eggtoolbutton.c
trunk/libegg/toolbar/eggtoolitem.c
trunk/libegg/treeviewutils/egg-cell-renderer-text.h
trunk/libegg/treeviewutils/eggcellrendererkeys.h
trunk/libegg/treeviewutils/eggtreemodelfilter.c
trunk/libegg/treeviewutils/eggtreemodelfilter.h
Modified: trunk/libegg/column-chooser/eggcolumnchooserdialog.c
==============================================================================
--- trunk/libegg/column-chooser/eggcolumnchooserdialog.c (original)
+++ trunk/libegg/column-chooser/eggcolumnchooserdialog.c Fri Jun 20 14:07:51 2008
@@ -42,7 +42,7 @@
GType
egg_column_chooser_dialog_get_type (void)
{
- static GtkType object_type = 0;
+ static GType object_type = 0;
if (!object_type) {
static const GTypeInfo object_info = {
Modified: trunk/libegg/column-chooser/eggcolumnchooserdialog.h
==============================================================================
--- trunk/libegg/column-chooser/eggcolumnchooserdialog.h (original)
+++ trunk/libegg/column-chooser/eggcolumnchooserdialog.h Fri Jun 20 14:07:51 2008
@@ -31,11 +31,11 @@
G_BEGIN_DECLS
#define EGG_TYPE_COLUMN_CHOOSER_DIALOG (egg_column_chooser_dialog_get_type ())
-#define EGG_COLUMN_CHOOSER_DIALOG(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialog))
-#define EGG_COLUMN_CHOOSER_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialogClass))
-#define EGG_IS_COLUMN_CHOOSER_DIALOG(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
-#define EGG_IS_COLUMN_CHOOSER_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
-#define EGG_COLUMN_CHOOSER_DIALOG_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, GanttViewClass))
+#define EGG_COLUMN_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialog))
+#define EGG_COLUMN_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialogClass))
+#define EGG_IS_COLUMN_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
+#define EGG_IS_COLUMN_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
+#define EGG_COLUMN_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, GanttViewClass))
typedef struct _EggColumnChooserDialog EggColumnChooserDialog;
typedef struct _EggColumnChooserDialogClass EggColumnChooserDialogClass;
Modified: trunk/libegg/combo-old/eggentry.c
==============================================================================
--- trunk/libegg/combo-old/eggentry.c (original)
+++ trunk/libegg/combo-old/eggentry.c Fri Jun 20 14:07:51 2008
@@ -143,7 +143,7 @@
EggCompletionFunc completion_func;
gpointer completion_func_data;
- GtkDestroyNotify completion_func_destroy;
+ GDestroyNotify completion_func_destroy;
gint list_column;
gint entry_column;
@@ -384,23 +384,23 @@
static GtkWidgetClass *parent_class = NULL;
-GtkType
+GType
egg_entry_get_type (void)
{
- static GtkType entry_type = 0;
+ static GType entry_type = 0;
if (!entry_type)
{
- static const GtkTypeInfo entry_info =
+ static const GTypeInfo entry_info =
{
"EggEntry",
sizeof (EggEntry),
sizeof (EggEntryClass),
- (GtkClassInitFunc) egg_entry_class_init,
- (GtkObjectInitFunc) egg_entry_init,
+ (GBaseInitFunc) egg_entry_class_init,
+ (GInstanceInitFunc) egg_entry_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ (GBaseInitFunc) NULL,
};
static const GInterfaceInfo editable_info =
@@ -4795,7 +4795,7 @@
gint entry_column,
EggCompletionFunc func,
gpointer func_data,
- GtkDestroyNotify func_destroy)
+ GDestroyNotify func_destroy)
{
EggEntryExtInfo *info;
Modified: trunk/libegg/combo-old/eggentry.h
==============================================================================
--- trunk/libegg/combo-old/eggentry.h (original)
+++ trunk/libegg/combo-old/eggentry.h Fri Jun 20 14:07:51 2008
@@ -42,11 +42,11 @@
#define EGG_TYPE_ENTRY (egg_entry_get_type ())
-#define EGG_ENTRY(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_ENTRY, EggEntry))
-#define EGG_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_ENTRY, EggEntryClass))
-#define EGG_IS_ENTRY(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_ENTRY))
-#define EGG_IS_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_ENTRY))
-#define EGG_ENTRY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_ENTRY, EggEntryClass))
+#define EGG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_ENTRY, EggEntry))
+#define EGG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_ENTRY, EggEntryClass))
+#define EGG_IS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_ENTRY))
+#define EGG_IS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_ENTRY))
+#define EGG_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_ENTRY, EggEntryClass))
typedef struct _EggEntry EggEntry;
@@ -153,7 +153,7 @@
gpointer user_data);
-GtkType egg_entry_get_type (void) G_GNUC_CONST;
+GType egg_entry_get_type (void) G_GNUC_CONST;
GtkWidget* egg_entry_new (void);
void egg_entry_set_visibility (EggEntry *entry,
gboolean visible);
@@ -197,7 +197,7 @@
gint entry_column,
EggCompletionFunc func,
gpointer func_data,
- GtkDestroyNotify func_destroy);
+ GDestroyNotify func_destroy);
gboolean egg_entry_completion_enabled (EggEntry *entry);
Modified: trunk/libegg/datetime/egg-datetime.c
==============================================================================
--- trunk/libegg/datetime/egg-datetime.c (original)
+++ trunk/libegg/datetime/egg-datetime.c Fri Jun 20 14:07:51 2008
@@ -266,10 +266,10 @@
static GtkHBoxClass *parent_class = NULL;
-GtkType
+GType
egg_datetime_get_type (void)
{
- static GtkType datetime_type = 0;
+ static GType datetime_type = 0;
if (!datetime_type) {
static const GTypeInfo datetime_info = {
Modified: trunk/libegg/datetime/egg-datetime.h
==============================================================================
--- trunk/libegg/datetime/egg-datetime.h (original)
+++ trunk/libegg/datetime/egg-datetime.h Fri Jun 20 14:07:51 2008
@@ -85,7 +85,7 @@
/* Constructors */
-GtkType egg_datetime_get_type (void);
+GType egg_datetime_get_type (void);
GtkWidget *egg_datetime_new (void);
GtkWidget *egg_datetime_new_from_time_t (time_t t);
GtkWidget *egg_datetime_new_from_struct_tm (struct tm *tm);
Modified: trunk/libegg/dock/egg-dock-item-grip.h
==============================================================================
--- trunk/libegg/dock/egg-dock-item-grip.h (original)
+++ trunk/libegg/dock/egg-dock-item-grip.h Fri Jun 20 14:07:51 2008
@@ -21,15 +21,15 @@
#define EGG_TYPE_DOCK_ITEM_GRIP (egg_dock_item_grip_get_type())
#define EGG_DOCK_ITEM_GRIP(obj) \
- (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGrip))
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGrip))
#define EGG_DOCK_ITEM_GRIP_CLASS(klass) \
- (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
+ (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
#define EGG_IS_DOCK_ITEM_GRIP(obj) \
- (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_ITEM_GRIP))
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_ITEM_GRIP))
#define EGG_IS_DOCK_ITEM_GRIP_CLASS(klass) \
- (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM_GRIP))
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM_GRIP))
#define EGG_DOCK_ITEM_GRIP_GET_CLASS(obj) \
- (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_DOCK_ITEM_GRIP, EggDockItemGripClass))
typedef struct _EggDockItemGripPrivate EggDockItemGripPrivate;
Modified: trunk/libegg/dock/egg-dock-item.c
==============================================================================
--- trunk/libegg/dock/egg-dock-item.c (original)
+++ trunk/libegg/dock/egg-dock-item.c Fri Jun 20 14:07:51 2008
@@ -78,7 +78,7 @@
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-static GtkType egg_dock_item_child_type (GtkContainer *container);
+static GType egg_dock_item_child_type (GtkContainer *container);
static void egg_dock_item_size_request (GtkWidget *widget,
GtkRequisition *requisition);
@@ -615,7 +615,7 @@
(* callback) (item->child, callback_data);
}
-static GtkType
+static GType
egg_dock_item_child_type (GtkContainer *container)
{
g_return_val_if_fail (EGG_IS_DOCK_ITEM (container), G_TYPE_NONE);
Modified: trunk/libegg/dock/egg-dock-item.h
==============================================================================
--- trunk/libegg/dock/egg-dock-item.h (original)
+++ trunk/libegg/dock/egg-dock-item.h Fri Jun 20 14:07:51 2008
@@ -37,11 +37,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_ITEM (egg_dock_item_get_type ())
-#define EGG_DOCK_ITEM(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_ITEM, EggDockItem))
-#define EGG_DOCK_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM, EggDockItemClass))
-#define EGG_IS_DOCK_ITEM(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_ITEM))
-#define EGG_IS_DOCK_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM))
-#define EGG_DOCK_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_ITEM, EggDockItemClass))
+#define EGG_DOCK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_ITEM, EggDockItem))
+#define EGG_DOCK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_ITEM, EggDockItemClass))
+#define EGG_IS_DOCK_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_ITEM))
+#define EGG_IS_DOCK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_ITEM))
+#define EGG_DOCK_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_ITEM, EggDockItemClass))
/* data types & structures */
typedef enum {
Modified: trunk/libegg/dock/egg-dock-layout.h
==============================================================================
--- trunk/libegg/dock/egg-dock-layout.h (original)
+++ trunk/libegg/dock/egg-dock-layout.h Fri Jun 20 14:07:51 2008
@@ -30,11 +30,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_LAYOUT (egg_dock_layout_get_type ())
-#define EGG_DOCK_LAYOUT(object) (GTK_CHECK_CAST ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayout))
-#define EGG_DOCK_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
-#define EGG_IS_DOCK_LAYOUT(object) (GTK_CHECK_TYPE ((object), EGG_TYPE_DOCK_LAYOUT))
-#define EGG_IS_DOCK_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_LAYOUT))
-#define EGG_DOCK_LAYOUT_GET_CLASS(object) (GTK_CHECK_GET_CLASS ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
+#define EGG_DOCK_LAYOUT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayout))
+#define EGG_DOCK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
+#define EGG_IS_DOCK_LAYOUT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), EGG_TYPE_DOCK_LAYOUT))
+#define EGG_IS_DOCK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_LAYOUT))
+#define EGG_DOCK_LAYOUT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), EGG_TYPE_DOCK_LAYOUT, EggDockLayoutClass))
/* data types & structures */
typedef struct _EggDockLayout EggDockLayout;
Modified: trunk/libegg/dock/egg-dock-master.h
==============================================================================
--- trunk/libegg/dock/egg-dock-master.h (original)
+++ trunk/libegg/dock/egg-dock-master.h Fri Jun 20 14:07:51 2008
@@ -32,11 +32,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_MASTER (egg_dock_master_get_type ())
-#define EGG_DOCK_MASTER(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_MASTER, EggDockMaster))
-#define EGG_DOCK_MASTER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_MASTER, EggDockMasterClass))
-#define EGG_IS_DOCK_MASTER(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_MASTER))
-#define EGG_IS_DOCK_MASTER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_MASTER))
-#define EGG_DOCK_MASTER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_MASTER, EggDockMasterClass))
+#define EGG_DOCK_MASTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_MASTER, EggDockMaster))
+#define EGG_DOCK_MASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_MASTER, EggDockMasterClass))
+#define EGG_IS_DOCK_MASTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_MASTER))
+#define EGG_IS_DOCK_MASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_MASTER))
+#define EGG_DOCK_MASTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_MASTER, EggDockMasterClass))
/* data types & structures */
typedef struct _EggDockMaster EggDockMaster;
Modified: trunk/libegg/dock/egg-dock-notebook.h
==============================================================================
--- trunk/libegg/dock/egg-dock-notebook.h (original)
+++ trunk/libegg/dock/egg-dock-notebook.h Fri Jun 20 14:07:51 2008
@@ -28,11 +28,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_NOTEBOOK (egg_dock_notebook_get_type ())
-#define EGG_DOCK_NOTEBOOK(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebook))
-#define EGG_DOCK_NOTEBOOK_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
-#define EGG_IS_DOCK_NOTEBOOK(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_NOTEBOOK))
-#define EGG_IS_DOCK_NOTEBOOK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_NOTEBOOK))
-#define EGG_DOCK_NOTEBOOK_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
+#define EGG_DOCK_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebook))
+#define EGG_DOCK_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
+#define EGG_IS_DOCK_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_NOTEBOOK))
+#define EGG_IS_DOCK_NOTEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_NOTEBOOK))
+#define EGG_DOCK_NOTEBOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_NOTEBOOK, EggDockNotebookClass))
/* data types & structures */
typedef struct _EggDockNotebook EggDockNotebook;
Modified: trunk/libegg/dock/egg-dock-object.h
==============================================================================
--- trunk/libegg/dock/egg-dock-object.h (original)
+++ trunk/libegg/dock/egg-dock-object.h Fri Jun 20 14:07:51 2008
@@ -29,11 +29,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_OBJECT (egg_dock_object_get_type ())
-#define EGG_DOCK_OBJECT(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_OBJECT, EggDockObject))
-#define EGG_DOCK_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_OBJECT, EggDockObjectClass))
-#define EGG_IS_DOCK_OBJECT(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_OBJECT))
-#define EGG_IS_DOCK_OBJECT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_OBJECT))
-#define EGG_DOCK_OBJECT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_OBJECT, EggDockObjectClass))
+#define EGG_DOCK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_OBJECT, EggDockObject))
+#define EGG_DOCK_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_OBJECT, EggDockObjectClass))
+#define EGG_IS_DOCK_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_OBJECT))
+#define EGG_IS_DOCK_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_OBJECT))
+#define EGG_DOCK_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_OBJECT, EggDockObjectClass))
/* data types & structures */
typedef enum {
Modified: trunk/libegg/dock/egg-dock-paned.h
==============================================================================
--- trunk/libegg/dock/egg-dock-paned.h (original)
+++ trunk/libegg/dock/egg-dock-paned.h Fri Jun 20 14:07:51 2008
@@ -29,11 +29,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_PANED (egg_dock_paned_get_type ())
-#define EGG_DOCK_PANED(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_PANED, EggDockPaned))
-#define EGG_DOCK_PANED_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PANED, EggDockPanedClass))
-#define EGG_IS_DOCK_PANED(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_PANED))
-#define EGG_IS_DOCK_PANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PANED))
-#define EGG_DOCK_PANED_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYE_DOCK_PANED, EggDockPanedClass))
+#define EGG_DOCK_PANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_PANED, EggDockPaned))
+#define EGG_DOCK_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PANED, EggDockPanedClass))
+#define EGG_IS_DOCK_PANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_PANED))
+#define EGG_IS_DOCK_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PANED))
+#define EGG_DOCK_PANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYE_DOCK_PANED, EggDockPanedClass))
/* data types & structures */
typedef struct _EggDockPaned EggDockPaned;
Modified: trunk/libegg/dock/egg-dock-placeholder.h
==============================================================================
--- trunk/libegg/dock/egg-dock-placeholder.h (original)
+++ trunk/libegg/dock/egg-dock-placeholder.h Fri Jun 20 14:07:51 2008
@@ -29,11 +29,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_PLACEHOLDER (egg_dock_placeholder_get_type ())
-#define EGG_DOCK_PLACEHOLDER(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholder))
-#define EGG_DOCK_PLACEHOLDER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
-#define EGG_IS_DOCK_PLACEHOLDER(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_PLACEHOLDER))
-#define EGG_IS_DOCK_PLACEHOLDER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PLACEHOLDER))
-#define EGG_DOCK_PLACEHOLDER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
+#define EGG_DOCK_PLACEHOLDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholder))
+#define EGG_DOCK_PLACEHOLDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
+#define EGG_IS_DOCK_PLACEHOLDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_PLACEHOLDER))
+#define EGG_IS_DOCK_PLACEHOLDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_PLACEHOLDER))
+#define EGG_DOCK_PLACEHOLDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_PLACEHOLDER, EggDockPlaceholderClass))
/* data types & structures */
typedef struct _EggDockPlaceholder EggDockPlaceholder;
Modified: trunk/libegg/dock/egg-dock-tablabel.h
==============================================================================
--- trunk/libegg/dock/egg-dock-tablabel.h (original)
+++ trunk/libegg/dock/egg-dock-tablabel.h Fri Jun 20 14:07:51 2008
@@ -31,11 +31,11 @@
/* standard macros */
#define EGG_TYPE_DOCK_TABLABEL (egg_dock_tablabel_get_type ())
-#define EGG_DOCK_TABLABEL(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK_TABLABEL, EggDockTablabel))
-#define EGG_DOCK_TABLABEL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
-#define EGG_IS_DOCK_TABLABEL(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK_TABLABEL))
-#define EGG_IS_DOCK_TABLABEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_TABLABEL))
-#define EGG_DOCK_TABLABEL_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
+#define EGG_DOCK_TABLABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK_TABLABEL, EggDockTablabel))
+#define EGG_DOCK_TABLABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
+#define EGG_IS_DOCK_TABLABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK_TABLABEL))
+#define EGG_IS_DOCK_TABLABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK_TABLABEL))
+#define EGG_DOCK_TABLABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK_TABLABEL, EggDockTablabelClass))
/* data types & structures */
typedef struct _EggDockTablabel EggDockTablabel;
Modified: trunk/libegg/dock/egg-dock.c
==============================================================================
--- trunk/libegg/dock/egg-dock.c (original)
+++ trunk/libegg/dock/egg-dock.c Fri Jun 20 14:07:51 2008
@@ -77,7 +77,7 @@
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-static GtkType egg_dock_child_type (GtkContainer *container);
+static GType egg_dock_child_type (GtkContainer *container);
static void egg_dock_detach (EggDockObject *object,
gboolean recursive);
@@ -741,7 +741,7 @@
(*callback) (GTK_WIDGET (dock->root), callback_data);
}
-static GtkType
+static GType
egg_dock_child_type (GtkContainer *container)
{
return EGG_TYPE_DOCK_ITEM;
Modified: trunk/libegg/dock/egg-dock.h
==============================================================================
--- trunk/libegg/dock/egg-dock.h (original)
+++ trunk/libegg/dock/egg-dock.h Fri Jun 20 14:07:51 2008
@@ -30,11 +30,11 @@
/* standard macros */
#define EGG_TYPE_DOCK (egg_dock_get_type ())
-#define EGG_DOCK(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_DOCK, EggDock))
-#define EGG_DOCK_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK, EggDockClass))
-#define EGG_IS_DOCK(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_DOCK))
-#define EGG_IS_DOCK_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK))
-#define EGG_DOCK_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DOCK, EggDockClass))
+#define EGG_DOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_DOCK, EggDock))
+#define EGG_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_DOCK, EggDockClass))
+#define EGG_IS_DOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_DOCK))
+#define EGG_IS_DOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_DOCK))
+#define EGG_DOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_DOCK, EggDockClass))
/* data types & structures */
typedef struct _EggDock EggDock;
Modified: trunk/libegg/iconlist/eggiconlist.h
==============================================================================
--- trunk/libegg/iconlist/eggiconlist.h (original)
+++ trunk/libegg/iconlist/eggiconlist.h Fri Jun 20 14:07:51 2008
@@ -25,11 +25,11 @@
G_BEGIN_DECLS
#define EGG_TYPE_ICON_LIST (egg_icon_list_get_type ())
-#define EGG_ICON_LIST(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_ICON_LIST, EggIconList))
-#define EGG_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_ICON_LIST, EggIconListClass))
-#define EGG_IS_ICON_LIST(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_ICON_LIST))
-#define EGG_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_ICON_LIST))
-#define EGG_ICON_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_ICON_LIST, EggIconListClass))
+#define EGG_ICON_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_ICON_LIST, EggIconList))
+#define EGG_ICON_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_ICON_LIST, EggIconListClass))
+#define EGG_IS_ICON_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_ICON_LIST))
+#define EGG_IS_ICON_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_ICON_LIST))
+#define EGG_ICON_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_ICON_LIST, EggIconListClass))
typedef struct _EggIconList EggIconList;
typedef struct _EggIconListClass EggIconListClass;
Modified: trunk/libegg/menu/egg-accel-dialog.c
==============================================================================
--- trunk/libegg/menu/egg-accel-dialog.c (original)
+++ trunk/libegg/menu/egg-accel-dialog.c Fri Jun 20 14:07:51 2008
@@ -6,7 +6,7 @@
GType
egg_accel_dialog_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/menu/egg-action.c
==============================================================================
--- trunk/libegg/menu/egg-action.c (original)
+++ trunk/libegg/menu/egg-action.c Fri Jun 20 14:07:51 2008
@@ -38,7 +38,7 @@
GType
egg_action_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/menu/egg-menu-merge.c
==============================================================================
--- trunk/libegg/menu/egg-menu-merge.c (original)
+++ trunk/libegg/menu/egg-menu-merge.c Fri Jun 20 14:07:51 2008
@@ -50,7 +50,7 @@
GType
egg_menu_merge_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/menu/egg-radio-action.c
==============================================================================
--- trunk/libegg/menu/egg-radio-action.c (original)
+++ trunk/libegg/menu/egg-radio-action.c Fri Jun 20 14:07:51 2008
@@ -6,7 +6,7 @@
GType
egg_radio_action_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/menu/egg-toggle-action.c
==============================================================================
--- trunk/libegg/menu/egg-toggle-action.c (original)
+++ trunk/libegg/menu/egg-toggle-action.c Fri Jun 20 14:07:51 2008
@@ -12,7 +12,7 @@
GType
egg_toggle_action_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/recent-files/egg-recent-view.c
==============================================================================
--- trunk/libegg/recent-files/egg-recent-view.c (original)
+++ trunk/libegg/recent-files/egg-recent-view.c Fri Jun 20 14:07:51 2008
@@ -28,10 +28,10 @@
#include "egg-recent-view.h"
-GtkType
+GType
egg_recent_view_get_type (void)
{
- static GtkType view_type = 0;
+ static GType view_type = 0;
if (!view_type)
{
Modified: trunk/libegg/recent-files/egg-recent-view.h
==============================================================================
--- trunk/libegg/recent-files/egg-recent-view.h (original)
+++ trunk/libegg/recent-files/egg-recent-view.h Fri Jun 20 14:07:51 2008
@@ -30,7 +30,7 @@
EggRecentModel * (* do_get_model) (EggRecentView *view);
};
-GtkType egg_recent_view_get_type (void) G_GNUC_CONST;
+GType egg_recent_view_get_type (void) G_GNUC_CONST;
void egg_recent_view_set_list (EggRecentView *view,
GSList *list);
void egg_recent_view_clear (EggRecentView *view);
Modified: trunk/libegg/toolbar/eggtoolbar.c
==============================================================================
--- trunk/libegg/toolbar/eggtoolbar.c (original)
+++ trunk/libegg/toolbar/eggtoolbar.c Fri Jun 20 14:07:51 2008
@@ -212,7 +212,7 @@
GType
egg_toolbar_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/toolbar/eggtoolbutton.c
==============================================================================
--- trunk/libegg/toolbar/eggtoolbutton.c (original)
+++ trunk/libegg/toolbar/eggtoolbutton.c Fri Jun 20 14:07:51 2008
@@ -82,7 +82,7 @@
GType
egg_tool_button_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/toolbar/eggtoolitem.c
==============================================================================
--- trunk/libegg/toolbar/eggtoolitem.c (original)
+++ trunk/libegg/toolbar/eggtoolitem.c Fri Jun 20 14:07:51 2008
@@ -79,7 +79,7 @@
GType
egg_tool_item_get_type (void)
{
- static GtkType type = 0;
+ static GType type = 0;
if (!type)
{
Modified: trunk/libegg/treeviewutils/egg-cell-renderer-text.h
==============================================================================
--- trunk/libegg/treeviewutils/egg-cell-renderer-text.h (original)
+++ trunk/libegg/treeviewutils/egg-cell-renderer-text.h Fri Jun 20 14:07:51 2008
@@ -28,11 +28,11 @@
G_BEGIN_DECLS
#define EGG_TYPE_CELL_RENDERER_TEXT (egg_cell_renderer_text_get_type ())
-#define EGG_CELL_RENDERER_TEXT(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_CELL_RENDERER_TEXT, EggCellRendererText))
-#define EGG_CELL_RENDERER_TEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_TEXT, EggCellRendererTextClass))
-#define EGG_IS_CELL_RENDERER_TEXT(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_CELL_RENDERER_TEXT))
-#define EGG_IS_CELL_RENDERER_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_TEXT))
-#define EGG_CELL_RENDERER_TEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_TEXT, EggCellRendererTextClass))
+#define EGG_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_CELL_RENDERER_TEXT, EggCellRendererText))
+#define EGG_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_TEXT, EggCellRendererTextClass))
+#define EGG_IS_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_CELL_RENDERER_TEXT))
+#define EGG_IS_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_TEXT))
+#define EGG_CELL_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_TEXT, EggCellRendererTextClass))
typedef struct _EggCellRendererText EggCellRendererText;
typedef struct _EggCellRendererTextClass EggCellRendererTextClass;
Modified: trunk/libegg/treeviewutils/eggcellrendererkeys.h
==============================================================================
--- trunk/libegg/treeviewutils/eggcellrendererkeys.h (original)
+++ trunk/libegg/treeviewutils/eggcellrendererkeys.h Fri Jun 20 14:07:51 2008
@@ -26,11 +26,11 @@
G_BEGIN_DECLS
#define EGG_TYPE_CELL_RENDERER_KEYS (egg_cell_renderer_keys_get_type ())
-#define EGG_CELL_RENDERER_KEYS(obj) (GTK_CHECK_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys))
-#define EGG_CELL_RENDERER_KEYS_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
-#define EGG_IS_CELL_RENDERER_KEYS(obj) (GTK_CHECK_TYPE ((obj), EGG_TYPE_CELL_RENDERER_KEYS))
-#define EGG_IS_CELL_RENDERER_KEYS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_KEYS))
-#define EGG_CELL_RENDERER_KEYS_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
+#define EGG_CELL_RENDERER_KEYS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeys))
+#define EGG_CELL_RENDERER_KEYS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
+#define EGG_IS_CELL_RENDERER_KEYS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_CELL_RENDERER_KEYS))
+#define EGG_IS_CELL_RENDERER_KEYS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_CELL_RENDERER_KEYS))
+#define EGG_CELL_RENDERER_KEYS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_CELL_RENDERER_KEYS, EggCellRendererKeysClass))
typedef struct _EggCellRendererKeys EggCellRendererKeys;
typedef struct _EggCellRendererKeysClass EggCellRendererKeysClass;
Modified: trunk/libegg/treeviewutils/eggtreemodelfilter.c
==============================================================================
--- trunk/libegg/treeviewutils/eggtreemodelfilter.c (original)
+++ trunk/libegg/treeviewutils/eggtreemodelfilter.c Fri Jun 20 14:07:51 2008
@@ -2317,7 +2317,7 @@
egg_tree_model_filter_set_visible_func (EggTreeModelFilter *filter,
EggTreeModelFilterVisibleFunc func,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
g_return_if_fail (EGG_IS_TREE_MODEL_FILTER (filter));
g_return_if_fail (func != NULL);
@@ -2325,7 +2325,7 @@
if (filter->visible_func)
{
- GtkDestroyNotify d = filter->visible_destroy;
+ GDestroyNotify d = filter->visible_destroy;
filter->visible_destroy = NULL;
d (filter->visible_data);
@@ -2356,7 +2356,7 @@
GType *types,
EggTreeModelFilterModifyFunc func,
gpointer data,
- GtkDestroyNotify destroy)
+ GDestroyNotify destroy)
{
g_return_if_fail (EGG_IS_TREE_MODEL_FILTER (filter));
g_return_if_fail (func != NULL);
@@ -2364,7 +2364,7 @@
if (filter->modify_destroy)
{
- GtkDestroyNotify d = filter->modify_destroy;
+ GDestroyNotify d = filter->modify_destroy;
filter->modify_destroy = NULL;
d (filter->modify_data);
Modified: trunk/libegg/treeviewutils/eggtreemodelfilter.h
==============================================================================
--- trunk/libegg/treeviewutils/eggtreemodelfilter.h (original)
+++ trunk/libegg/treeviewutils/eggtreemodelfilter.h Fri Jun 20 14:07:51 2008
@@ -61,7 +61,7 @@
EggTreeModelFilterVisibleFunc visible_func;
gpointer visible_data;
- GtkDestroyNotify visible_destroy;
+ GDestroyNotify visible_destroy;
gint modify_n_columns;
GType *modify_types;
@@ -93,13 +93,13 @@
void egg_tree_model_filter_set_visible_func (EggTreeModelFilter *filter,
EggTreeModelFilterVisibleFunc func,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
void egg_tree_model_filter_set_modify_func (EggTreeModelFilter *filter,
gint n_columns,
GType *types,
EggTreeModelFilterModifyFunc func,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
void egg_tree_model_filter_set_visible_column (EggTreeModelFilter *filter,
gint column);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
