menubutton: Don't derive from GtkToggleButton

Make GtkMenuButton a widget that has a
toggle button, instead of deriving from it.

We give it icon-name and label properties,
to let people do what they expect to do
with menu buttons.

1 files changed, 14 insertions, 2 deletions

diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index be019c30c3..d26d93f052 100644
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -44,12 +44,12 @@ typedef struct _GtkMenuButtonPrivate GtkMenuButtonPrivate;
 
 struct _GtkMenuButton
 {
-  GtkToggleButton parent_instance;
+  GtkWidget parent_instance;
 };
 
 struct _GtkMenuButtonClass
 {
-  GtkToggleButtonClass parent_class;
+  GtkWidgetClass parent_class;
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -100,6 +100,18 @@ void         gtk_menu_button_set_use_popover (GtkMenuButton *menu_button,
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_menu_button_get_use_popover (GtkMenuButton *menu_button);
 
+GDK_AVAILABLE_IN_ALL
+void         gtk_menu_button_set_icon_name (GtkMenuButton *menu_button,
+                                            const char    *icon_name);
+GDK_AVAILABLE_IN_ALL
+const char * gtk_menu_button_get_icon_name (GtkMenuButton *menu_button);
+
+GDK_AVAILABLE_IN_ALL
+void         gtk_menu_button_set_label (GtkMenuButton *menu_button,
+                                        const char    *label);
+GDK_AVAILABLE_IN_ALL
+const char * gtk_menu_button_get_label (GtkMenuButton *menu_button);
+
 
 G_END_DECLS