X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenubutton.h;h=8aa2644cd2c46d564766903ab1f2bc81fea3d97c;hb=d84f5ae17e5b891b30dd54ddc10fd22c2a609e0e;hp=c89205333a466c3c674b7cfe1c9bb6e104ea3be5;hpb=9d35f7e5121c863685375d1afb7e14e886e46348;p=~andy%2Fgtk

diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index c89205333..8aa2644cd 100644
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -18,14 +18,15 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_MENU_BUTTON_H__
+#define __GTK_MENU_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MENU_BUTTON_H__
-#define __GTK_MENU_BUTTON_H__
-
-#include <gtk/gtk.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkmenu.h>
 
 G_BEGIN_DECLS
 
@@ -52,8 +53,6 @@ struct _GtkMenuButtonClass
 {
   GtkToggleButtonClass parent_class;
 
-  void (*show_menu) (GtkMenuButton *button);
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -61,17 +60,34 @@ struct _GtkMenuButtonClass
   void (*_gtk_reserved4) (void);
 };
 
-GType      gtk_menu_button_get_type       (void) G_GNUC_CONST;
-GtkWidget *gtk_menu_button_new                  (void);
-
-void       gtk_menu_button_set_menu          (GtkMenuButton *menu_button,
-                                           GtkWidget       *menu);
-void       gtk_menu_button_set_direction  (GtkMenuButton *menu_button,
-                                           GtkArrowType     direction);
-void       gtk_menu_button_set_menu_model (GtkMenuButton *menu_button,
-                                           GMenuModel    *menu_model);
-void       gtk_menu_button_set_parent     (GtkMenuButton *menu_button,
-                                           GtkWidget     *parent);
+GDK_AVAILABLE_IN_3_6
+GType        gtk_menu_button_get_type       (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_3_6
+GtkWidget   *gtk_menu_button_new            (void);
+
+GDK_AVAILABLE_IN_3_6
+void         gtk_menu_button_set_popup      (GtkMenuButton *menu_button,
+                                             GtkWidget     *popup);
+GDK_AVAILABLE_IN_3_6
+GtkMenu     *gtk_menu_button_get_popup      (GtkMenuButton *menu_button);
+
+GDK_AVAILABLE_IN_3_6
+void         gtk_menu_button_set_direction  (GtkMenuButton *menu_button,
+                                             GtkArrowType   direction);
+GDK_AVAILABLE_IN_3_6
+GtkArrowType gtk_menu_button_get_direction  (GtkMenuButton *menu_button);
+
+GDK_AVAILABLE_IN_3_6
+void         gtk_menu_button_set_menu_model (GtkMenuButton *menu_button,
+                                             GMenuModel    *menu_model);
+GDK_AVAILABLE_IN_3_6
+GMenuModel  *gtk_menu_button_get_menu_model (GtkMenuButton *menu_button);
+
+GDK_AVAILABLE_IN_3_6
+void         gtk_menu_button_set_align_widget (GtkMenuButton *menu_button,
+                                               GtkWidget     *align_widget);
+GDK_AVAILABLE_IN_3_6
+GtkWidget   *gtk_menu_button_get_align_widget (GtkMenuButton *menu_button);
 
 G_END_DECLS