callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix problem with installation directory for gdkx.h

Browse Source 
Fri Apr  7 17:19:27 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/Makefile.am: Fix problem with installation directory for
	gdkx.h

	* gtk/gtkmenuitem.c gtk/gtkmenushell.c: Patch from David Santiago
	<mrcooger@cyberverse.com> so that when selecting menus with the
	mouse, the first item will not be selected, but when selecting
	with an accelerator, or navigating left-right on a menubar with
	the menus popped up, the first item will be selected.
This commit is contained in:
Owen Taylor
2000-04-07 21:36:13 +00:00
committed by Owen Taylor
parent d96d7ada5a
commit 848cff384e
10 changed files with 116 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkmenushell.c
View File

@ -136,6 +136,7 @@ static gint gtk_menu_shell_is_item (GtkMenuShell *menu_shell,
static GtkWidget *gtk_menu_shell_get_item (GtkMenuShell *menu_shell,
GdkEvent *event);
static GtkType gtk_menu_shell_child_type (GtkContainer *container);
static void gtk_menu_shell_select_submenu_first (GtkMenuShell *menu_shell);
static void gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell,
GtkMenuDirectionType direction);
@ -903,6 +904,21 @@ gtk_menu_shell_move_selected (GtkMenuShell *menu_shell,
}
}
static void
gtk_menu_shell_select_submenu_first (GtkMenuShell *menu_shell)
{
GtkMenuItem *menu_item;
menu_item = GTK_MENU_ITEM (menu_shell->active_menu_item);
if (menu_item->submenu)
{
GtkMenuShell *submenu = GTK_MENU_SHELL (menu_item->submenu);
if (submenu->children)
gtk_menu_shell_select_item (submenu, submenu->children->data);
}
}
static void
gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell,
GtkMenuDirectionType direction)
@ -923,8 +939,11 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell,
if (GTK_MENU_SHELL_CLASS (GTK_OBJECT (parent_menu_shell)->klass)->submenu_placement ==
GTK_MENU_SHELL_CLASS (GTK_OBJECT (menu_shell)->klass)->submenu_placement)
gtk_menu_shell_deselect (menu_shell);
else
gtk_menu_shell_move_selected (parent_menu_shell, -1);
else
{
gtk_menu_shell_move_selected (parent_menu_shell, -1);
gtk_menu_shell_select_submenu_first (parent_menu_shell);
}
}
break;
@ -946,7 +965,10 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell,
parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell);
if (parent_menu_shell)
gtk_menu_shell_move_selected (parent_menu_shell, 1);
{
gtk_menu_shell_move_selected (parent_menu_shell, 1);
gtk_menu_shell_select_submenu_first (parent_menu_shell);
}
}
break;