Have the unit test check if the filter model emits the right signals

[~andy/gtk] / gtk / gtkitem.h

diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h
index 8fc75950a565420b90158f4dc00bd6dd4742b0d8..4c3d3aee6333e40746a550b927fb50fa6af44d6f 100644 (file)
--- a/gtk/gtkitem.h
+++ b/gtk/gtkitem.h
@@ -21,28 +21,28 @@
  * 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_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_ITEM_H__
 #define __GTK_ITEM_H__
 
 
-#include <gdk/gdk.h>
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ITEM                  (gtk_item_get_type ())
-#define GTK_ITEM(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_ITEM, GtkItem))
-#define GTK_ITEM_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM, GtkItemClass))
-#define GTK_IS_ITEM(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_ITEM))
-#define GTK_IS_ITEM_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM))
-#define GTK_ITEM_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ITEM, GtkItemClass))
+#define GTK_ITEM(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ITEM, GtkItem))
+#define GTK_ITEM_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ITEM, GtkItemClass))
+#define GTK_IS_ITEM(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ITEM))
+#define GTK_IS_ITEM_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ITEM))
+#define GTK_ITEM_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ITEM, GtkItemClass))
 
 
 typedef struct _GtkItem       GtkItem;
@@ -69,15 +69,11 @@ struct _GtkItemClass
 };
 
 
-GtkType gtk_item_get_type (void) G_GNUC_CONST;
-void    gtk_item_select   (GtkItem *item);
-void    gtk_item_deselect (GtkItem *item);
-void    gtk_item_toggle   (GtkItem *item);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GType gtk_item_get_type (void) G_GNUC_CONST;
+void  gtk_item_select   (GtkItem *item);
+void  gtk_item_deselect (GtkItem *item);
+void  gtk_item_toggle   (GtkItem *item);
 
+G_END_DECLS
 
 #endif /* __GTK_ITEM_H__ */