gtk/gtksocket.c Splice out backend-dependend parts to separate files, see

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

diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 05cbc38c4e197c4a87429a1a39adefb77199d13c..7889440485480ef73a90375dce7731048bcef223 100644 (file)
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -31,17 +31,15 @@
 #include <gtk/gtkbbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VBUTTON_BOX            (gtk_vbutton_box_get_type ())
-#define GTK_VBUTTON_BOX(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox))
-#define GTK_VBUTTON_BOX_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
-#define GTK_IS_VBUTTON_BOX(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_VBUTTON_BOX))
-#define GTK_IS_VBUTTON_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBUTTON_BOX))
-#define GTK_VBUTTON_BOX_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
+#define GTK_VBUTTON_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBox))
+#define GTK_VBUTTON_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
+#define GTK_IS_VBUTTON_BOX(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_VBUTTON_BOX))
+#define GTK_IS_VBUTTON_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VBUTTON_BOX))
+#define GTK_VBUTTON_BOX_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_VBUTTON_BOX, GtkVButtonBoxClass))
 
 
 typedef struct _GtkVButtonBox       GtkVButtonBox;
@@ -58,21 +56,21 @@ struct _GtkVButtonBoxClass
 };
 
 
-GtkType    gtk_vbutton_box_get_type (void);
+GType      gtk_vbutton_box_get_type (void) G_GNUC_CONST;
 GtkWidget *gtk_vbutton_box_new      (void);
 
 /* buttons can be added by gtk_container_add() */
 
+#ifndef GTK_DISABLE_DEPRECATED
 gint gtk_vbutton_box_get_spacing_default (void);
 void gtk_vbutton_box_set_spacing_default (gint spacing);
 
 GtkButtonBoxStyle gtk_vbutton_box_get_layout_default (void);
 void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
+#endif
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_VBUTTON_BOX_H__ */