+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.
+
2000-04-05 Dan Damian <dand@dnttm.ro>
* configure.in: Added "ro" to ALL_LINGUAS.
+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.
+
2000-04-05 Dan Damian <dand@dnttm.ro>
* configure.in: Added "ro" to ALL_LINGUAS.
+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.
+
2000-04-05 Dan Damian <dand@dnttm.ro>
* configure.in: Added "ro" to ALL_LINGUAS.
+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.
+
2000-04-05 Dan Damian <dand@dnttm.ro>
* configure.in: Added "ro" to ALL_LINGUAS.
+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.
+
2000-04-05 Dan Damian <dand@dnttm.ro>
* configure.in: Added "ro" to ALL_LINGUAS.
+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.
+
2000-04-05 Dan Damian <dand@dnttm.ro>
* configure.in: Added "ro" to ALL_LINGUAS.
+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.
+
2000-04-05 Dan Damian <dand@dnttm.ro>
* configure.in: Added "ro" to ALL_LINGUAS.
## Process this file with automake to produce Makefile.in
+libgdkincludedir = $(includedir)/gdk
+
INCLUDES = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gdk\" \
-I$(top_srcdir) \
gdkinputprivate.h \
$(xinput_sources)
-INCLUDE_HEADERS = \
+libgdkinclude_HEADERS = \
gdkx.h
EXTRA_PROGRAMS = gxid
static void gtk_real_menu_item_deselect (GtkItem *item);
static void gtk_real_menu_item_activate_item (GtkMenuItem *item);
static gint gtk_menu_item_select_timeout (gpointer data);
-static void gtk_menu_item_select_timeout_unlocked (gpointer data);
+static void gtk_menu_item_popup_submenu (gpointer data);
static void gtk_menu_item_position_menu (GtkMenu *menu,
gint *x,
gint *y,
gtk_menu_item_select_timeout,
menu_item);
else
- gtk_menu_item_select_timeout_unlocked (menu_item);
+ gtk_menu_item_popup_submenu (menu_item);
if(event) gdk_event_free(event);
}
gtk_real_menu_item_activate_item (GtkMenuItem *menu_item)
{
GtkWidget *widget;
+ GtkMenuShell *submenu;
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
menu_shell->active = TRUE;
}
- gtk_menu_shell_select_item (GTK_MENU_SHELL (widget->parent), widget);
+ gtk_menu_shell_select_item (GTK_MENU_SHELL (widget->parent), widget);
+ gtk_menu_item_popup_submenu (widget);
+
+ submenu = GTK_MENU_SHELL (menu_item->submenu);
+ if (submenu->children)
+ gtk_menu_shell_select_item (submenu, submenu->children->data);
}
}
}
{
GDK_THREADS_ENTER ();
- gtk_menu_item_select_timeout_unlocked (data);
+ gtk_menu_item_popup_submenu (data);
GDK_THREADS_LEAVE ();
}
static void
-gtk_menu_item_select_timeout_unlocked (gpointer data)
+gtk_menu_item_popup_submenu (gpointer data)
{
GtkMenuItem *menu_item;
menu_item,
GTK_MENU_SHELL (GTK_WIDGET (menu_item)->parent)->button,
0);
-
- /* This is a bit of a hack - we want to select the first item
- * of menus hanging of a menu bar, but not for cascading submenus
- */
- if (GTK_IS_MENU_BAR (GTK_WIDGET (menu_item)->parent))
- {
- GtkMenuShell *submenu = GTK_MENU_SHELL (menu_item->submenu);
- if (submenu->children)
- gtk_menu_shell_select_item (submenu, submenu->children->data);
- }
}
}
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);
}
}
+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)
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;
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;