diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml | 2 | ||||
-rw-r--r-- | gtk/gtkmenutoolbutton.c | 18 | ||||
-rw-r--r-- | gtk/gtkmenutoolbutton.h | 2 |
7 files changed, 31 insertions, 11 deletions
@@ -1,3 +1,8 @@ +2004-10-05 Paolo Borelli <pborelli@katamail.com> + + * gtk/gtkmenutoolbutton.c: rename the activate-menu signal to + show-menu as discussed in bug #153873. + 2004-10-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a2afc7b02..c26eea7a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-10-05 Paolo Borelli <pborelli@katamail.com> + + * gtk/gtkmenutoolbutton.c: rename the activate-menu signal to + show-menu as discussed in bug #153873. + 2004-10-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a2afc7b02..c26eea7a4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-10-05 Paolo Borelli <pborelli@katamail.com> + + * gtk/gtkmenutoolbutton.c: rename the activate-menu signal to + show-menu as discussed in bug #153873. + 2004-10-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a2afc7b02..c26eea7a4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-10-05 Paolo Borelli <pborelli@katamail.com> + + * gtk/gtkmenutoolbutton.c: rename the activate-menu signal to + show-menu as discussed in bug #153873. + 2004-10-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set diff --git a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml index f7d6c093c..bafbb218d 100644 --- a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml @@ -41,7 +41,7 @@ A #GtkToolItem containing a button with an additional dropdown menu. </para> -<!-- ##### SIGNAL GtkMenuToolButton::menu-activated ##### --> +<!-- ##### SIGNAL GtkMenuToolButton::show-menu ##### --> <para> </para> diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 45c24d13a..e5aea705b 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -48,7 +48,7 @@ static void gtk_menu_tool_button_finalize (GObject *object); enum { - MENU_ACTIVATED, + SHOW_MENU, LAST_SIGNAL }; @@ -232,14 +232,14 @@ gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass) toolitem_class->set_tooltip = gtk_menu_tool_button_set_tooltip; toolitem_class->toolbar_reconfigured = gtk_menu_tool_button_toolbar_reconfigured; - signals[MENU_ACTIVATED] = - g_signal_new ("menu-activated", + signals[SHOW_MENU] = + g_signal_new ("show-menu", G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GtkMenuToolButtonClass, menu_activated), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkMenuToolButtonClass, show_menu), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); g_object_class_install_property (object_class, PROP_MENU, @@ -338,7 +338,7 @@ popup_menu_under_arrow (GtkMenuToolButton *button, priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button); - g_signal_emit (button, signals[MENU_ACTIVATED], 0); + g_signal_emit (button, signals[SHOW_MENU], 0); if (!priv->menu) return; diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h index 8c95de130..6f7539b0f 100644 --- a/gtk/gtkmenutoolbutton.h +++ b/gtk/gtkmenutoolbutton.h @@ -50,7 +50,7 @@ struct _GtkMenuToolButtonClass { GtkToolButtonClass parent_class; - void (*menu_activated) (GtkMenuToolButton *button); + void (*show_menu) (GtkMenuToolButton *button); /* Padding for future expansion */ void (*_gtk_reserved1) (void); |