Commit eff6f6d3 authored by Soeren Sandmann's avatar Soeren Sandmann Committed by Søren Sandmann Pedersen

Revert the "drag select" part of #141169. (#144011).

Thu Jun 10 00:22:51 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkmenu.c: Revert the "drag select" part of
	#141169. (#144011).
parent b539a678
Thu Jun 10 00:22:51 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c: Revert the "drag select" part of
#141169. (#144011).
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
......
Thu Jun 10 00:22:51 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c: Revert the "drag select" part of
#141169. (#144011).
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
......
Thu Jun 10 00:22:51 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c: Revert the "drag select" part of
#141169. (#144011).
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
......
Thu Jun 10 00:22:51 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkmenu.c: Revert the "drag select" part of
#141169. (#144011).
Mon Jun 7 23:07:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle
......
......@@ -75,8 +75,6 @@ struct _GtkMenuAttachData
struct _GtkMenuPrivate
{
gboolean seen_enter;
gboolean seen_motion;
gboolean have_position;
gint x;
gint y;
......@@ -1270,7 +1268,6 @@ gtk_menu_popup (GtkMenu *menu,
GtkWidget *parent;
GdkEvent *current_event;
GtkMenuShell *menu_shell;
GtkMenuPrivate *priv = gtk_menu_get_private (menu);
g_return_if_fail (GTK_IS_MENU (menu));
......@@ -1278,9 +1275,6 @@ gtk_menu_popup (GtkMenu *menu,
menu_shell = GTK_MENU_SHELL (menu);
menu_shell->parent_menu_shell = parent_menu_shell;
priv->seen_enter = FALSE;
priv->seen_motion = FALSE;
/* Find the last viewable ancestor, and make an X grab on it
*/
......@@ -2723,21 +2717,7 @@ gtk_menu_motion_notify (GtkWidget *widget,
gboolean need_enter;
if (GTK_IS_MENU (widget))
{
GtkMenuPrivate *priv = gtk_menu_get_private (GTK_MENU (widget));
gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
priv->seen_motion = TRUE;
if (priv->seen_enter)
{
/* After having seen both a motion and an enter,
* button releases should be interpreted as "activate".
*/
GTK_MENU_SHELL (widget)->activate_time = 0;
}
}
gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
/* We received the event for one of two reasons:
*
......@@ -2969,20 +2949,9 @@ gtk_menu_enter_notify (GtkWidget *widget,
if (widget && GTK_IS_MENU (widget))
{
GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget);
GtkMenuPrivate *priv = gtk_menu_get_private (GTK_MENU (widget));
if (!menu_shell->ignore_enter)
gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
priv->seen_enter = TRUE;
if (priv->seen_motion)
{
/* After having seen both a motion and an enter,
* button releases should be interpreted as "activate".
*/
GTK_MENU_SHELL (widget)->activate_time = 0;
}
}
/* If this is a faked enter (see gtk_menu_motion_notify), 'widget'
......
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