Non-exported _gtk_menu_select_first() function that selects the first item

Sat Feb  2 20:16:04 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenushell.c (_gtk_menu_shell_select_first):
        Non-exported _gtk_menu_select_first() function that
        selects the first item of the menu in a standard
        way. (Skipping tearoffs.)

        * gtk/gtkmenushell.c gtk/gtkentry.c gtk/gtktextview.c
        gtkmenuitem.c: Use _gtk_menu_shell_select_first().

        * gtk/gtkmenuitem.c (gtk_real_menu_item_select): Remember
        if we are starting the timeout from a keypress so
        we can set menushell->ignore_enter properly.

        * gtk/gtknotebook.c (focus_child_in): Return something
        meaningful if there are no children.

        * gtk/gtkmenu.c (gtk_menu_key_press): Fix precendence
        problem.
This commit is contained in:
Owen Taylor
2002-02-03 01:25:32 +00:00
committed by Owen Taylor
parent 0ed21b67d9
commit ae7521bd9d
15 changed files with 203 additions and 68 deletions

View File

@ -33,6 +33,7 @@
#include "gtkmenuitem.h"
#include "gtkmenushell.h"
#include "gtksignal.h"
#include "gtktearoffmenuitem.h"
#include "gtkwindow.h"
#define MENU_SHELL_TIMEOUT 500
@ -926,6 +927,38 @@ gtk_menu_shell_move_selected (GtkMenuShell *menu_shell,
}
}
/**
* _gtk_menu_shell_select_first:
* @menu_shell: a #GtkMenuShell
*
* Select the first visible child of the menu shell, unless
* it's a tearoff item.
**/
void
_gtk_menu_shell_select_first (GtkMenuShell *menu_shell)
{
GtkWidget *to_select = NULL;
GList *tmp_list;
tmp_list = menu_shell->children;
while (tmp_list)
{
GtkWidget *child = tmp_list->data;
if (GTK_WIDGET_VISIBLE (child))
{
to_select = child;
if (!GTK_IS_TEAROFF_MENU_ITEM (child))
break;
}
tmp_list = tmp_list->next;
}
if (to_select)
gtk_menu_shell_select_item (menu_shell, to_select);
}
static void
gtk_menu_shell_select_submenu_first (GtkMenuShell *menu_shell)
{
@ -934,11 +967,7 @@ gtk_menu_shell_select_submenu_first (GtkMenuShell *menu_shell)
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);
}
_gtk_menu_shell_select_first (GTK_MENU_SHELL (menu_item->submenu));
}
static void
@ -974,9 +1003,7 @@ gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell,
_gtk_menu_item_is_selectable (menu_shell->active_menu_item) &&
GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu)
{
menu_shell = GTK_MENU_SHELL (GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu);
if (menu_shell->children)
gtk_menu_shell_select_item (menu_shell, menu_shell->children->data);
gtk_menu_shell_select_submenu_first (menu_shell);
}
else
{