Really make GtkFileSystem private by _-prefixing all functions.

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

diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 4b17e8820ddbebbb199dddfb0e06e9c535a78576..d71f98d2d884025fcf1fa907702228afc6462b74 100644 (file)
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -19,11 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_MENU_TOOL_BUTTON_H__
 #define __GTK_MENU_TOOL_BUTTON_H__
 
-#include "gtkmenu.h"
-#include "gtk/gtktoolbutton.h"
+#include <gtk/gtkmenu.h>
+#include <gtk/gtktoolbutton.h>
 
 G_BEGIN_DECLS
 
@@ -50,7 +54,7 @@ struct _GtkMenuToolButtonClass
 {
   GtkToolButtonClass parent_class;
 
-  void (*menu_activated) (GtkMenuToolButton *button);
+  void (*show_menu) (GtkMenuToolButton *button);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -59,7 +63,7 @@ struct _GtkMenuToolButtonClass
   void (*_gtk_reserved4) (void);
 };
 
-GType         gtk_menu_tool_button_get_type       (void);
+GType         gtk_menu_tool_button_get_type       (void) G_GNUC_CONST;
 GtkToolItem  *gtk_menu_tool_button_new            (GtkWidget   *icon_widget,
                                                    const gchar *label);
 GtkToolItem  *gtk_menu_tool_button_new_from_stock (const gchar *stock_id);
@@ -68,11 +72,18 @@ void          gtk_menu_tool_button_set_menu       (GtkMenuToolButton *button,
                                                    GtkWidget         *menu);
 GtkWidget    *gtk_menu_tool_button_get_menu       (GtkMenuToolButton *button);
 
+#ifndef GTK_DISABLE_DEPRECATED
 void          gtk_menu_tool_button_set_arrow_tooltip (GtkMenuToolButton *button,
                                                       GtkTooltips       *tooltips,
                                                       const gchar       *tip_text,
                                                       const gchar       *tip_private);
+#endif /* GTK_DISABLE_DEPRECATED */
+
+void          gtk_menu_tool_button_set_arrow_tooltip_text   (GtkMenuToolButton *button,
+                                                            const gchar       *text);
+void          gtk_menu_tool_button_set_arrow_tooltip_markup (GtkMenuToolButton *button,
+                                                            const gchar       *markup);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* __GTK_MENU_TOOL_BUTTON_H__ */