Without setting "detail-width-chars" and "detail-height-rows"

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

diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h
index fc2355442259c8d91711c7087e9b4b8dd2950e04..10bb9a0c3fb990d13e47941b9a670963e79e1882 100644 (file)
--- a/gtk/gtkvpaned.h
+++ b/gtk/gtkvpaned.h
@@ -29,17 +29,16 @@
 
 #include <gtk/gtkpaned.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VPANED            (gtk_vpaned_get_type ())
-#define GTK_VPANED(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned))
-#define GTK_VPANED_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass))
-#define GTK_IS_VPANED(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_VPANED))
-#define GTK_IS_VPANED_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED))
-#define GTK_VPANED_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass))
+#define GTK_VPANED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VPANED, GtkVPaned))
+#define GTK_VPANED_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VPANED, GtkVPanedClass))
+#define GTK_IS_VPANED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VPANED))
+#define GTK_IS_VPANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VPANED))
+#define GTK_VPANED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VPANED, GtkVPanedClass))
 
 
 typedef struct _GtkVPaned      GtkVPaned;
@@ -55,12 +54,11 @@ struct _GtkVPanedClass
   GtkPanedClass parent_class;
 };
 
-GtkType    gtk_vpaned_get_type (void);
+GType      gtk_vpaned_get_type (void) G_GNUC_CONST;
 GtkWidget *gtk_vpaned_new      (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
 
 #endif /* __GTK_VPANED_H__ */