Add GtkBubbleWindow

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

diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index f03e8a9bbdf9facae9ee7aa8c0b3a593860e60f9..8aa2644cd2c46d564766903ab1f2bc81fea3d97c 100644 (file)
--- 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
 
@@ -66,16 +67,10 @@ GtkWidget   *gtk_menu_button_new            (void);
 
 GDK_AVAILABLE_IN_3_6
 void         gtk_menu_button_set_popup      (GtkMenuButton *menu_button,
-                                             GtkWidget     *menu);
+                                             GtkWidget     *popup);
 GDK_AVAILABLE_IN_3_6
 GtkMenu     *gtk_menu_button_get_popup      (GtkMenuButton *menu_button);
 
-GDK_DEPRECATED_IN_3_6_FOR(gtk_menu_button_set_popup)
-void         gtk_menu_button_set_menu       (GtkMenuButton *menu_button,
-                                             GtkWidget     *menu);
-GDK_DEPRECATED_IN_3_6_FOR(gtk_menu_button_get_popup)
-GtkMenu     *gtk_menu_button_get_menu       (GtkMenuButton *menu_button);
-
 GDK_AVAILABLE_IN_3_6
 void         gtk_menu_button_set_direction  (GtkMenuButton *menu_button,
                                              GtkArrowType   direction);