diff --git a/ChangeLog b/ChangeLog index e3591e6045..2af4c5e8ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2008-09-23 Michael Natterer + + * gtk/gtkclist.h + * gtk/gtkctree.h + * gtk/gtklist.h + * gtk/gtklistitem.h + * gtk/gtkobject.h + * gtk/gtkoldeditable.h + * gtk/gtkpixmap.h + * gtk/gtkpreview.h + * gtk/gtktext.h + * gtk/gtktipsquery.h + * gtk/gtktree.h + * gtk/gtktreeitem.h: get rid of GtkType and GTK_CHECK_FOO() also + in all deprecated headers. + 2008-09-22 Matthias Clasen Bug 553135 – eog crash: assertion failed. Gtk error: diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h index 6e40eb2491..bca7401c85 100644 --- a/gtk/gtkclist.h +++ b/gtk/gtkclist.h @@ -84,11 +84,11 @@ typedef enum } GtkButtonAction; #define GTK_TYPE_CLIST (gtk_clist_get_type ()) -#define GTK_CLIST(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CLIST, GtkCList)) -#define GTK_CLIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLIST, GtkCListClass)) -#define GTK_IS_CLIST(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CLIST)) -#define GTK_IS_CLIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLIST)) -#define GTK_CLIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CLIST, GtkCListClass)) +#define GTK_CLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIST, GtkCList)) +#define GTK_CLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLIST, GtkCListClass)) +#define GTK_IS_CLIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIST)) +#define GTK_IS_CLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLIST)) +#define GTK_CLIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CLIST, GtkCListClass)) #define GTK_CLIST_FLAGS(clist) (GTK_CLIST (clist)->flags) @@ -440,7 +440,7 @@ struct _GtkCell } u; }; -GtkType gtk_clist_get_type (void) G_GNUC_CONST; +GType gtk_clist_get_type (void) G_GNUC_CONST; /* create a new GtkCList */ GtkWidget* gtk_clist_new (gint columns); diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h index 1cf55236cc..a4aa83773b 100644 --- a/gtk/gtkctree.h +++ b/gtk/gtkctree.h @@ -38,11 +38,11 @@ G_BEGIN_DECLS #define GTK_TYPE_CTREE (gtk_ctree_get_type ()) -#define GTK_CTREE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CTREE, GtkCTree)) -#define GTK_CTREE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CTREE, GtkCTreeClass)) -#define GTK_IS_CTREE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CTREE)) -#define GTK_IS_CTREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CTREE)) -#define GTK_CTREE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CTREE, GtkCTreeClass)) +#define GTK_CTREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CTREE, GtkCTree)) +#define GTK_CTREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CTREE, GtkCTreeClass)) +#define GTK_IS_CTREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CTREE)) +#define GTK_IS_CTREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CTREE)) +#define GTK_CTREE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CTREE, GtkCTreeClass)) #define GTK_CTREE_ROW(_node_) ((GtkCTreeRow *)(((GList *)(_node_))->data)) #define GTK_CTREE_NODE(_node_) ((GtkCTreeNode *)((_node_))) @@ -172,7 +172,7 @@ struct _GtkCTreeNode { * Creation, insertion, deletion * ***********************************************************/ -GtkType gtk_ctree_get_type (void) G_GNUC_CONST; +GType gtk_ctree_get_type (void) G_GNUC_CONST; GtkWidget * gtk_ctree_new_with_titles (gint columns, gint tree_column, gchar *titles[]); diff --git a/gtk/gtklist.h b/gtk/gtklist.h index 873989e625..3a2f13f13b 100644 --- a/gtk/gtklist.h +++ b/gtk/gtklist.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_LIST_C__) @@ -34,11 +34,11 @@ G_BEGIN_DECLS #define GTK_TYPE_LIST (gtk_list_get_type ()) -#define GTK_LIST(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST, GtkList)) -#define GTK_LIST_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST, GtkListClass)) -#define GTK_IS_LIST(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST)) -#define GTK_IS_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST)) -#define GTK_LIST_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST, GtkListClass)) +#define GTK_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LIST, GtkList)) +#define GTK_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST, GtkListClass)) +#define GTK_IS_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LIST)) +#define GTK_IS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST)) +#define GTK_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LIST, GtkListClass)) typedef struct _GtkList GtkList; @@ -81,7 +81,7 @@ struct _GtkListClass }; -GtkType gtk_list_get_type (void) G_GNUC_CONST; +GType gtk_list_get_type (void) G_GNUC_CONST; GtkWidget* gtk_list_new (void); void gtk_list_insert_items (GtkList *list, GList *items, diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h index f2955a40b9..9f83a48722 100644 --- a/gtk/gtklistitem.h +++ b/gtk/gtklistitem.h @@ -36,11 +36,11 @@ G_BEGIN_DECLS #define GTK_TYPE_LIST_ITEM (gtk_list_item_get_type ()) -#define GTK_LIST_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_LIST_ITEM, GtkListItem)) -#define GTK_LIST_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST_ITEM, GtkListItemClass)) -#define GTK_IS_LIST_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_LIST_ITEM)) -#define GTK_IS_LIST_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_ITEM)) -#define GTK_LIST_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_LIST_ITEM, GtkListItemClass)) +#define GTK_LIST_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LIST_ITEM, GtkListItem)) +#define GTK_LIST_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LIST_ITEM, GtkListItemClass)) +#define GTK_IS_LIST_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LIST_ITEM)) +#define GTK_IS_LIST_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LIST_ITEM)) +#define GTK_LIST_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LIST_ITEM, GtkListItemClass)) typedef struct _GtkListItem GtkListItem; @@ -75,7 +75,7 @@ struct _GtkListItemClass }; -GtkType gtk_list_item_get_type (void) G_GNUC_CONST; +GType gtk_list_item_get_type (void) G_GNUC_CONST; GtkWidget* gtk_list_item_new (void); GtkWidget* gtk_list_item_new_with_label (const gchar *label); void gtk_list_item_select (GtkListItem *list_item); diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 041d757e50..b7b9dcc226 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -135,7 +135,7 @@ void gtk_object_destroy (GtkObject *object); #ifndef GTK_DISABLE_DEPRECATED -GtkObject* gtk_object_new (GtkType type, +GtkObject* gtk_object_new (GType type, const gchar *first_property_name, ...); GtkObject* gtk_object_ref (GtkObject *object); @@ -219,10 +219,10 @@ void gtk_object_get (GtkObject *object, void gtk_object_set (GtkObject *object, const gchar *first_property_name, ...) G_GNUC_NULL_TERMINATED; -void gtk_object_add_arg_type (const gchar *arg_name, - GtkType arg_type, - guint arg_flags, - guint arg_id); +void gtk_object_add_arg_type (const gchar *arg_name, + GType arg_type, + guint arg_flags, + guint arg_id); #endif /* GTK_DISABLE_DEPRECATED */ diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h index 50fa9ea5c9..ba497cd1cc 100644 --- a/gtk/gtkoldeditable.h +++ b/gtk/gtkoldeditable.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #ifndef GTK_DISABLE_DEPRECATED @@ -35,11 +35,11 @@ G_BEGIN_DECLS #define GTK_TYPE_OLD_EDITABLE (gtk_old_editable_get_type ()) -#define GTK_OLD_EDITABLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditable)) -#define GTK_OLD_EDITABLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass)) -#define GTK_IS_OLD_EDITABLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_OLD_EDITABLE)) -#define GTK_IS_OLD_EDITABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OLD_EDITABLE)) -#define GTK_OLD_EDITABLE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass)) +#define GTK_OLD_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditable)) +#define GTK_OLD_EDITABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass)) +#define GTK_IS_OLD_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_OLD_EDITABLE)) +#define GTK_IS_OLD_EDITABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_OLD_EDITABLE)) +#define GTK_OLD_EDITABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_OLD_EDITABLE, GtkOldEditableClass)) typedef struct _GtkOldEditable GtkOldEditable; @@ -113,7 +113,7 @@ struct _GtkOldEditableClass gint position); }; -GtkType gtk_old_editable_get_type (void) G_GNUC_CONST; +GType gtk_old_editable_get_type (void) G_GNUC_CONST; void gtk_old_editable_claim_selection (GtkOldEditable *old_editable, gboolean claim, guint32 time_); diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h index bfad050e89..21fa349938 100644 --- a/gtk/gtkpixmap.h +++ b/gtk/gtkpixmap.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PIXMAP_C__) @@ -35,11 +35,11 @@ G_BEGIN_DECLS #define GTK_TYPE_PIXMAP (gtk_pixmap_get_type ()) -#define GTK_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap)) -#define GTK_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP, GtkPixmapClass)) -#define GTK_IS_PIXMAP(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP)) -#define GTK_IS_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP)) -#define GTK_PIXMAP_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP, GtkPixmapClass)) +#define GTK_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap)) +#define GTK_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP, GtkPixmapClass)) +#define GTK_IS_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PIXMAP)) +#define GTK_IS_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP)) +#define GTK_PIXMAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PIXMAP, GtkPixmapClass)) typedef struct _GtkPixmap GtkPixmap; @@ -48,7 +48,7 @@ typedef struct _GtkPixmapClass GtkPixmapClass; struct _GtkPixmap { GtkMisc misc; - + GdkPixmap *pixmap; GdkBitmap *mask; @@ -62,7 +62,7 @@ struct _GtkPixmapClass }; -GtkType gtk_pixmap_get_type (void) G_GNUC_CONST; +GType gtk_pixmap_get_type (void) G_GNUC_CONST; GtkWidget* gtk_pixmap_new (GdkPixmap *pixmap, GdkBitmap *mask); void gtk_pixmap_set (GtkPixmap *pixmap, diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h index e4b211d71c..5e87c94aa3 100644 --- a/gtk/gtkpreview.h +++ b/gtk/gtkpreview.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #ifndef GTK_DISABLE_DEPRECATED @@ -35,11 +35,11 @@ G_BEGIN_DECLS #define GTK_TYPE_PREVIEW (gtk_preview_get_type ()) -#define GTK_PREVIEW(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview)) -#define GTK_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PREVIEW, GtkPreviewClass)) -#define GTK_IS_PREVIEW(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PREVIEW)) -#define GTK_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PREVIEW)) -#define GTK_PREVIEW_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PREVIEW, GtkPreviewClass)) +#define GTK_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PREVIEW, GtkPreview)) +#define GTK_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PREVIEW, GtkPreviewClass)) +#define GTK_IS_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PREVIEW)) +#define GTK_IS_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PREVIEW)) +#define GTK_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PREVIEW, GtkPreviewClass)) typedef struct _GtkPreview GtkPreview; @@ -86,7 +86,7 @@ struct _GtkPreviewClass }; -GtkType gtk_preview_get_type (void) G_GNUC_CONST; +GType gtk_preview_get_type (void) G_GNUC_CONST; void gtk_preview_uninit (void); GtkWidget* gtk_preview_new (GtkPreviewType type); void gtk_preview_size (GtkPreview *preview, diff --git a/gtk/gtktext.h b/gtk/gtktext.h index a2be7faf59..32dc14a033 100644 --- a/gtk/gtktext.h +++ b/gtk/gtktext.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #ifdef GTK_ENABLE_BROKEN @@ -37,11 +37,11 @@ G_BEGIN_DECLS #define GTK_TYPE_TEXT (gtk_text_get_type ()) -#define GTK_TEXT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT, GtkText)) -#define GTK_TEXT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass)) -#define GTK_IS_TEXT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT)) -#define GTK_IS_TEXT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT)) -#define GTK_TEXT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass)) +#define GTK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT, GtkText)) +#define GTK_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass)) +#define GTK_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT)) +#define GTK_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT)) +#define GTK_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass)) typedef struct _GtkTextFont GtkTextFont; @@ -176,7 +176,7 @@ struct _GtkTextClass }; -GtkType gtk_text_get_type (void) G_GNUC_CONST; +GType gtk_text_get_type (void) G_GNUC_CONST; GtkWidget* gtk_text_new (GtkAdjustment *hadj, GtkAdjustment *vadj); void gtk_text_set_editable (GtkText *text, diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h index 4973a986ee..500ecf425b 100644 --- a/gtk/gtktipsquery.h +++ b/gtk/gtktipsquery.h @@ -39,11 +39,11 @@ G_BEGIN_DECLS /* --- type macros --- */ #define GTK_TYPE_TIPS_QUERY (gtk_tips_query_get_type ()) -#define GTK_TIPS_QUERY(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQuery)) -#define GTK_TIPS_QUERY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass)) -#define GTK_IS_TIPS_QUERY(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TIPS_QUERY)) -#define GTK_IS_TIPS_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TIPS_QUERY)) -#define GTK_TIPS_QUERY_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass)) +#define GTK_TIPS_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQuery)) +#define GTK_TIPS_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass)) +#define GTK_IS_TIPS_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TIPS_QUERY)) +#define GTK_IS_TIPS_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TIPS_QUERY)) +#define GTK_TIPS_QUERY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TIPS_QUERY, GtkTipsQueryClass)) /* --- typedefs --- */ @@ -92,7 +92,7 @@ struct _GtkTipsQueryClass /* --- prototypes --- */ -GtkType gtk_tips_query_get_type (void) G_GNUC_CONST; +GType gtk_tips_query_get_type (void) G_GNUC_CONST; GtkWidget* gtk_tips_query_new (void); void gtk_tips_query_start_query (GtkTipsQuery *tips_query); void gtk_tips_query_stop_query (GtkTipsQuery *tips_query); diff --git a/gtk/gtktree.h b/gtk/gtktree.h index 7e9da0eb59..d0b8089f1e 100644 --- a/gtk/gtktree.h +++ b/gtk/gtktree.h @@ -39,11 +39,11 @@ G_BEGIN_DECLS #define GTK_TYPE_TREE (gtk_tree_get_type ()) -#define GTK_TREE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE, GtkTree)) -#define GTK_TREE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE, GtkTreeClass)) -#define GTK_IS_TREE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE)) -#define GTK_IS_TREE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE)) -#define GTK_TREE_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE, GtkTreeClass)) +#define GTK_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE, GtkTree)) +#define GTK_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE, GtkTreeClass)) +#define GTK_IS_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE)) +#define GTK_IS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE)) +#define GTK_TREE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE, GtkTreeClass)) #define GTK_IS_ROOT_TREE(obj) ((GtkObject*) GTK_TREE(obj)->root_tree == (GtkObject*)obj) @@ -88,7 +88,7 @@ struct _GtkTreeClass }; -GtkType gtk_tree_get_type (void) G_GNUC_CONST; +GType gtk_tree_get_type (void) G_GNUC_CONST; GtkWidget* gtk_tree_new (void); void gtk_tree_append (GtkTree *tree, GtkWidget *tree_item); diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h index 0fef9e21e8..c7ba07a7f5 100644 --- a/gtk/gtktreeitem.h +++ b/gtk/gtktreeitem.h @@ -37,11 +37,11 @@ G_BEGIN_DECLS #define GTK_TYPE_TREE_ITEM (gtk_tree_item_get_type ()) -#define GTK_TREE_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItem)) -#define GTK_TREE_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_ITEM, GtkTreeItemClass)) -#define GTK_IS_TREE_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_ITEM)) -#define GTK_IS_TREE_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_ITEM)) -#define GTK_TREE_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItemClass)) +#define GTK_TREE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItem)) +#define GTK_TREE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_ITEM, GtkTreeItemClass)) +#define GTK_IS_TREE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_ITEM)) +#define GTK_IS_TREE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_ITEM)) +#define GTK_TREE_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_ITEM, GtkTreeItemClass)) #define GTK_TREE_ITEM_SUBTREE(obj) (GTK_TREE_ITEM(obj)->subtree) @@ -72,7 +72,7 @@ struct _GtkTreeItemClass }; -GtkType gtk_tree_item_get_type (void) G_GNUC_CONST; +GType gtk_tree_item_get_type (void) G_GNUC_CONST; GtkWidget* gtk_tree_item_new (void); GtkWidget* gtk_tree_item_new_with_label (const gchar *label); void gtk_tree_item_set_subtree (GtkTreeItem *tree_item,