summaryrefslogtreecommitdiff
path: root/gtk/gtkmenu.c
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2004-02-29 18:21:57 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2004-02-29 18:21:57 +0000
commit41dfb5ec46ee3785a2cf1ae3a8919c49b9b5ee70 (patch)
tree9afe2267e10ee1064511b88db0c14070fe32e3ea /gtk/gtkmenu.c
parentfc29c1a2fb70a70ff494e4e3b2bb11be7b5816dc (diff)
downloadgtk+-41dfb5ec46ee3785a2cf1ae3a8919c49b9b5ee70.tar.gz
New internal function returning a good step value for the mouse wheel. For
Sun Feb 29 19:04:33 2004 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkrange.c (_gtk_range_get_wheel_delta): New internal function returning a good step value for the mouse wheel. For scrollbars, base the step on page_size^(2/3), for other ranges, use 2 * step_increment. * gtk/gtkrange.c (gtk_range_scroll_event): Use it here ... * gtk/gtkscrolledwindow.c (gtk_scrolled_window_scroll_event): ... and here. * gtk/gtkmenu.c (gtk_menu_leave_notify): Fix a warning.
Diffstat (limited to 'gtk/gtkmenu.c')
-rw-r--r--gtk/gtkmenu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index bd53ad6ec4..734f6c3c9d 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2880,7 +2880,7 @@ gtk_menu_leave_notify (GtkWidget *widget,
gtk_menu_set_submenu_navigation_region (menu, menu_item, event);
return TRUE;
}
- else if (menu_item == menu_shell->active_menu_item)
+ else if (menu_item == GTK_MENU_ITEM (menu_shell->active_menu_item))
{
/* We are leaving an active menu item with nonactive submenu.
* Deselect it so we don't surprise the user with by popping