Fix a crash with icon themes

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

diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index fe7b57e8e054c68d53b996159b68986ff08d615f..7692b77180acd5cc57f876307ec0da6151b174d3 100644 (file)
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -32,17 +32,15 @@
 #include <gtk/gtkmisc.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_ARROW                  (gtk_arrow_get_type ())
-#define GTK_ARROW(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_ARROW, GtkArrow))
-#define GTK_ARROW_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW, GtkArrowClass))
-#define GTK_IS_ARROW(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_ARROW))
-#define GTK_IS_ARROW_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
-#define GTK_ARROW_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
+#define GTK_ARROW(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW, GtkArrow))
+#define GTK_ARROW_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW, GtkArrowClass))
+#define GTK_IS_ARROW(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW))
+#define GTK_IS_ARROW_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
+#define GTK_ARROW_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
 
 
 typedef struct _GtkArrow       GtkArrow;
@@ -62,7 +60,7 @@ struct _GtkArrowClass
 };
 
 
-GtkType    gtk_arrow_get_type   (void) G_GNUC_CONST;
+GType      gtk_arrow_get_type   (void) G_GNUC_CONST;
 GtkWidget* gtk_arrow_new        (GtkArrowType   arrow_type,
                                 GtkShadowType  shadow_type);
 void       gtk_arrow_set        (GtkArrow      *arrow,
@@ -70,9 +68,7 @@ void       gtk_arrow_set        (GtkArrow      *arrow,
                                 GtkShadowType  shadow_type);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_ARROW_H__ */