Commit dd73be38 authored by Matthias Clasen's avatar Matthias Clasen

Fix commit 5f55c420

Make gtk_menu_shell_activate static and don't use it
outside gtkmenushell.c
parent c4010ec0
......@@ -1848,8 +1848,6 @@ gtk_real_menu_item_activate_item (GtkMenuItem *menu_item)
gtk_menu_shell_activate_item (menu_shell, widget, TRUE);
else
{
_gtk_menu_shell_activate (menu_shell);
gtk_menu_shell_select_item (menu_shell, widget);
_gtk_menu_item_popup_submenu (widget, FALSE);
......
......@@ -628,8 +628,8 @@ gtk_menu_shell_realize (GtkWidget *widget)
gtk_style_context_set_background (context, window);
}
void
_gtk_menu_shell_activate (GtkMenuShell *menu_shell)
static void
gtk_menu_shell_activate (GtkMenuShell *menu_shell)
{
GtkMenuShellPrivate *priv = menu_shell->priv;
......@@ -697,7 +697,7 @@ gtk_menu_shell_button_press (GtkWidget *widget,
gtk_widget_get_parent (menu_item) == widget &&
menu_item != priv->active_menu_item)
{
_gtk_menu_shell_activate (menu_shell);
gtk_menu_shell_activate (menu_shell);
priv->button = event->button;
if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)
......@@ -1312,7 +1312,7 @@ gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell,
return;
}
_gtk_menu_shell_activate (menu_shell);
gtk_menu_shell_activate (menu_shell);
priv->active_menu_item = menu_item;
if (pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT)
......
......@@ -75,8 +75,6 @@ void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,
gboolean keyboard_mode);
gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);
void _gtk_menu_shell_activate (GtkMenuShell *menu_shell);
G_END_DECLS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment