Flip the padding

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

diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 353a13b1fc5c9557afe59c315be47c9e39cd09a7..0d7a42e9ded27ca1b647cb0a0f4abbd47ed6181d 100644 (file)
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -32,17 +32,14 @@
 #include <gtk/gtkitem.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define        GTK_TYPE_MENU_ITEM              (gtk_menu_item_get_type ())
-#define GTK_MENU_ITEM(obj)             (GTK_CHECK_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
-#define GTK_MENU_ITEM_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
-#define GTK_IS_MENU_ITEM(obj)          (GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU_ITEM))
-#define GTK_IS_MENU_ITEM_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
-#define GTK_MENU_ITEM_GET_CLASS(obj)    (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
+#define GTK_MENU_ITEM(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
+#define GTK_MENU_ITEM_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
+#define GTK_IS_MENU_ITEM(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM))
+#define GTK_IS_MENU_ITEM_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
+#define GTK_MENU_ITEM_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
 
 
 typedef struct _GtkMenuItem      GtkMenuItem;
@@ -85,10 +82,16 @@ struct _GtkMenuItemClass
                                 gint        *requisition);
   void (* toggle_size_allocate) (GtkMenuItem *menu_item,
                                 gint         allocation);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType           gtk_menu_item_get_type             (void) G_GNUC_CONST;
+GType     gtk_menu_item_get_type             (void) G_GNUC_CONST;
 GtkWidget* gtk_menu_item_new                  (void);
 GtkWidget* gtk_menu_item_new_with_label       (const gchar         *label);
 GtkWidget* gtk_menu_item_new_with_mnemonic    (const gchar         *label);
@@ -115,14 +118,12 @@ void        _gtk_menu_item_refresh_accel_path   (GtkMenuItem         *menu_item,
                                               GtkAccelGroup       *accel_group,
                                               gboolean             group_changed);
 gboolean  _gtk_menu_item_is_selectable        (GtkWidget           *menu_item);
+void      _gtk_menu_item_popup_submenu        (GtkWidget           *menu_item);
 
 #ifndef GTK_DISABLE_DEPRECATED
 #define gtk_menu_item_right_justify(menu_item) gtk_menu_item_set_right_justified ((menu_item), TRUE)
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_MENU_ITEM_H__ */