diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-09-08 23:35:17 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-09-08 23:38:09 -0400 |
| commit | 3bd93e5bfd968d21cbcba15b952b254c41f204f9 (patch) | |
| tree | d465c06bbcf2f255ed6f82c00765ee69fa7f0d24 /gtk/gtkmenuitem.h | |
| parent | 72ac2175e2f0d3acd321ab8b8201e01806c3bfc4 (diff) | |
| download | gtk+-3bd93e5bfd968d21cbcba15b952b254c41f204f9.tar.gz | |
Remove GtkItem
With the demise of GtkList and GtkTree, it has GtkMenuItem as sole
derived class, and is not really adding any value as a separate class.
Its few useful features have been merged into GtkMenuItem.
Bug 629104
Diffstat (limited to 'gtk/gtkmenuitem.h')
| -rw-r--r-- | gtk/gtkmenuitem.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index 6334785f1b..cadccc02e5 100644 --- a/gtk/gtkmenuitem.h +++ b/gtk/gtkmenuitem.h @@ -31,8 +31,7 @@ #ifndef __GTK_MENU_ITEM_H__ #define __GTK_MENU_ITEM_H__ - -#include <gtk/gtkitem.h> +#include <gtk/gtkbin.h> G_BEGIN_DECLS @@ -50,7 +49,7 @@ typedef struct _GtkMenuItemClass GtkMenuItemClass; struct _GtkMenuItem { - GtkItem item; + GtkBin bin; GtkWidget *GSEAL (submenu); GdkWindow *GSEAL (event_window); @@ -70,7 +69,7 @@ struct _GtkMenuItem struct _GtkMenuItemClass { - GtkItemClass parent_class; + GtkBinClass parent_class; /* If the following flag is true, then we should always hide * the menu when the MenuItem is activated. Otherwise, the @@ -90,9 +89,14 @@ struct _GtkMenuItemClass const gchar *label); G_CONST_RETURN gchar *(* get_label) (GtkMenuItem *menu_item); + void (* select) (GtkMenuItem *menu_item); + void (* deselect) (GtkMenuItem *menu_item); + /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; |