Flip the padding

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

diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 2f59c0c9f270b93c19f0375972b8f48664026f7e..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;
@@ -53,16 +50,17 @@ struct _GtkMenuItem
   GtkItem item;
   
   GtkWidget *submenu;
+  GdkWindow *event_window;
   
-  guint          accelerator_signal;
   guint16 toggle_size;
   guint16 accelerator_width;
+  gchar  *accel_path;
   
-  guint show_toggle_indicator : 1;
   guint show_submenu_indicator : 1;
   guint submenu_placement : 1;
   guint submenu_direction : 1;
   guint right_justify: 1;
+  guint timer_from_keypress : 1;
   guint timer;
 };
 
@@ -70,7 +68,6 @@ struct _GtkMenuItemClass
 {
   GtkItemClass parent_class;
   
-  guint toggle_size;
   /* If the following flag is true, then we should always hide
    * the menu when the MenuItem is activated. Otherwise, the 
    * it is up to the caller. For instance, when navigating
@@ -79,31 +76,54 @@ struct _GtkMenuItemClass
    */
   guint hide_on_activate : 1;
   
-  void (* activate)      (GtkMenuItem *menu_item);
-  void (* activate_item) (GtkMenuItem *menu_item);
+  void (* activate)             (GtkMenuItem *menu_item);
+  void (* activate_item)        (GtkMenuItem *menu_item);
+  void (* toggle_size_request)  (GtkMenuItem *menu_item,
+                                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;
-GtkWidget* gtk_menu_item_new             (void);
-GtkWidget* gtk_menu_item_new_with_label          (const gchar         *label);
-void      gtk_menu_item_set_submenu      (GtkMenuItem         *menu_item,
-                                          GtkWidget           *submenu);
-void      gtk_menu_item_remove_submenu   (GtkMenuItem         *menu_item);
-void      gtk_menu_item_set_placement    (GtkMenuItem         *menu_item,
-                                          GtkSubmenuPlacement  placement);
-void      gtk_menu_item_configure        (GtkMenuItem         *menu_item,
-                                          gint                 show_toggle_indicator,
-                                          gint                 show_submenu_indicator);
-void      gtk_menu_item_select           (GtkMenuItem         *menu_item);
-void      gtk_menu_item_deselect         (GtkMenuItem         *menu_item);
-void      gtk_menu_item_activate         (GtkMenuItem         *menu_item);
-void      gtk_menu_item_right_justify    (GtkMenuItem         *menu_item);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+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);
+void       gtk_menu_item_set_submenu          (GtkMenuItem         *menu_item,
+                                              GtkWidget           *submenu);
+GtkWidget* gtk_menu_item_get_submenu          (GtkMenuItem         *menu_item);
+void       gtk_menu_item_remove_submenu       (GtkMenuItem         *menu_item);
+void       gtk_menu_item_select               (GtkMenuItem         *menu_item);
+void       gtk_menu_item_deselect             (GtkMenuItem         *menu_item);
+void       gtk_menu_item_activate             (GtkMenuItem         *menu_item);
+void       gtk_menu_item_toggle_size_request  (GtkMenuItem         *menu_item,
+                                              gint                *requisition);
+void       gtk_menu_item_toggle_size_allocate (GtkMenuItem         *menu_item,
+                                              gint                 allocation);
+void       gtk_menu_item_set_right_justified  (GtkMenuItem         *menu_item,
+                                              gboolean             right_justified);
+gboolean   gtk_menu_item_get_right_justified  (GtkMenuItem         *menu_item);
+void      gtk_menu_item_set_accel_path       (GtkMenuItem         *menu_item,
+                                              const gchar         *accel_path);
+
+/* private */
+void     _gtk_menu_item_refresh_accel_path   (GtkMenuItem         *menu_item,
+                                              const gchar         *prefix,
+                                              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 */
+
+G_END_DECLS
 
 #endif /* __GTK_MENU_ITEM_H__ */