X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenutoolbutton.h;h=50ee12ed9f47541e1c4e62622935c1fffb518075;hb=1074aa0c49f647ed4b2a969618051c59da5aad01;hp=8c95de130bd42dd4f16746fd7c9008a10fb349d8;hpb=48252de3452931721b427c16ab30235f6b4fe0fb;p=~andy%2Fgtk

diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 8c95de130..50ee12ed9 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -14,16 +14,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_MENU_TOOL_BUTTON_H__
 #define __GTK_MENU_TOOL_BUTTON_H__
 
-#include "gtkmenu.h"
-#include "gtk/gtktoolbutton.h"
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkmenu.h>
+#include <gtk/gtktoolbutton.h>
 
 G_BEGIN_DECLS
 
@@ -50,7 +52,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 +61,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);
@@ -67,11 +69,10 @@ GtkToolItem  *gtk_menu_tool_button_new_from_stock (const gchar *stock_id);
 void          gtk_menu_tool_button_set_menu       (GtkMenuToolButton *button,
                                                    GtkWidget         *menu);
 GtkWidget    *gtk_menu_tool_button_get_menu       (GtkMenuToolButton *button);
-
-void          gtk_menu_tool_button_set_arrow_tooltip (GtkMenuToolButton *button,
-                                                      GtkTooltips       *tooltips,
-                                                      const gchar       *tip_text,
-                                                      const gchar       *tip_private);
+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