Implement scroll wheel scrolling for menus. (#88532)

2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
	for menus. (#88532)

diff --git a/ChangeLog b/ChangeLog
index 25e43431541ebbd357626053c1f7983c8375f5c8..bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
+       for menus. (#88532)
+
        * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
        the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25e43431541ebbd357626053c1f7983c8375f5c8..bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
+       for menus. (#88532)
+
        * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
        the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 25e43431541ebbd357626053c1f7983c8375f5c8..bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
+       for menus. (#88532)
+
        * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
        the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25e43431541ebbd357626053c1f7983c8375f5c8..bfdd7dccbd5a0ba3741ca62dcd8df9074204cc22 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-12-13  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_scroll): Implement scroll wheel scrolling
+       for menus. (#88532)
+
        * gtk/gtkwindow.c (gtk_window_real_set_focus): Compare only
        the HAS_DEFAULT flags.  (#160711, Tommi Komulainen)
 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index af9d65ebfe0beb16260a7269dcb217c387047735..71048e84a624681ca67d8ecca12a52338c94cd7c 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1714,7 +1714,7 @@ gtk_menu_set_tearoff_hints (GtkMenu *menu,
   geometry_hints.max_width = width;
     
   geometry_hints.min_height = 0;
-  geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height + 10;
+  geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height;
 
   gtk_window_set_geometry_hints (GTK_WINDOW (menu->tearoff_window),
                                 NULL,
@@ -2840,7 +2840,7 @@ gtk_menu_scroll_by (GtkMenu *menu,
     gtk_menu_scroll_to (menu, offset);
 }
 
-Static gboolean
+static gboolean
 gtk_menu_scroll_timeout (gpointer  data)
 {
   GtkMenu *menu;