Remove OwnerGrabButtonMask from button entries for GDK_BUTTON_PRESS /

[~andy/gtk] / gtk / gtkmain.c

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 08ffc830feda9796bcab89e7dcf948db5dfb3b57..c28c134f67b108284965ce547a59f4fbc1d146b6 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -757,45 +757,10 @@ gtk_main_do_event (GdkEvent *event)
       gtk_widget_event (event_widget, event);
       break;
 
+    case GDK_SCROLL:
     case GDK_BUTTON_PRESS:
     case GDK_2BUTTON_PRESS:
     case GDK_3BUTTON_PRESS:
-    /* We treat button 4-5 specially, assume we have
-     * a MS-style scrollwheel mouse, and try to find
-     * a plausible widget to scroll. We also trap
-     * button 4-5 double and triple clicks here, since
-     * they will be generated if the user scrolls quickly.
-     */
-      if ((grab_widget == event_widget) &&
-         (event->button.button == 4 || event->button.button == 5))
-       {
-         GtkWidget *range = NULL;
-         GtkWidget *scrollwin;
-         
-         if (GTK_IS_RANGE (event_widget))
-           range = event_widget;
-         else
-           {
-             scrollwin = gtk_widget_get_ancestor (event_widget,
-                                                  GTK_TYPE_SCROLLED_WINDOW);
-             if (scrollwin)
-               range = GTK_SCROLLED_WINDOW (scrollwin)->vscrollbar;
-           }
-         
-         if (range && GTK_WIDGET_VISIBLE (range))
-           {
-             if (event->type == GDK_BUTTON_PRESS)
-               {
-                 GtkAdjustment *adj = GTK_RANGE (range)->adjustment;
-                 gfloat new_value = adj->value + ((event->button.button == 4) ? 
-                                                  -adj->page_increment / 2: 
-                                                   adj->page_increment / 2);
-                 new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-                 gtk_adjustment_set_value (adj, new_value);
-               }
-             break;
-           }
-       }
       gtk_propagate_event (grab_widget, event);
       break;