bockbuild/mac-sdk/patches/gtk/remove-mouse-scrolling-from-GtkNotebook-tabs.patch

   1 commit ad48f4d52bbac6139dd829fcc421ad16441f34d2
   2 Author: Cody Russell <bratsche@gnome.org>
   3 Date:   Tue Sep 21 16:18:22 2010 -0500
   4
   5     Remove mouse scrolling from GtkNotebook tabs.  Bug #630226.
   6
   7 diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
   8 index 0770de6..9931b4c 100644
   9 --- a/gtk/gtknotebook.c
  10 +++ b/gtk/gtknotebook.c
  11 @@ -257,8 +257,6 @@ static void gtk_notebook_size_allocate       (GtkWidget        *widget,
  12                                               GtkAllocation    *allocation);
  13  static gint gtk_notebook_expose              (GtkWidget        *widget,
  14                                               GdkEventExpose   *event);
  15 -static gboolean gtk_notebook_scroll          (GtkWidget        *widget,
  16 -                                              GdkEventScroll   *event);
  17  static gint gtk_notebook_button_press        (GtkWidget        *widget,
  18                                               GdkEventButton   *event);
  19  static gint gtk_notebook_button_release      (GtkWidget        *widget,
  20 @@ -542,7 +540,6 @@ gtk_notebook_class_init (GtkNotebookClass *class)
  21    widget_class->size_request = gtk_notebook_size_request;
  22    widget_class->size_allocate = gtk_notebook_size_allocate;
  23    widget_class->expose_event = gtk_notebook_expose;
  24 -  widget_class->scroll_event = gtk_notebook_scroll;
  25    widget_class->button_press_event = gtk_notebook_button_press;
  26    widget_class->button_release_event = gtk_notebook_button_release;
  27    widget_class->popup_menu = gtk_notebook_popup_menu;
  28 @@ -1658,7 +1655,6 @@ gtk_notebook_get_property (GObject         *object,
  29   * gtk_notebook_size_request
  30   * gtk_notebook_size_allocate
  31   * gtk_notebook_expose
  32 - * gtk_notebook_scroll
  33   * gtk_notebook_button_press
  34   * gtk_notebook_button_release
  35   * gtk_notebook_popup_menu
  36 @@ -1852,8 +1848,7 @@ gtk_notebook_realize (GtkWidget *widget)
  37    attributes.event_mask = gtk_widget_get_events (widget);
  38    attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
  39                             GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
  40 -                           GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK |
  41 -                           GDK_SCROLL_MASK);
  42 +                           GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
  43    attributes_mask = GDK_WA_X | GDK_WA_Y;
  44
  45    notebook->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
  46 @@ -2604,49 +2599,6 @@ get_widget_coordinates (GtkWidget *widget,
  47      return FALSE;
  48  }
  49
  50 -static gboolean
  51 -gtk_notebook_scroll (GtkWidget      *widget,
  52 -                     GdkEventScroll *event)
  53 -{
  54 -  GtkNotebookPrivate *priv = GTK_NOTEBOOK_GET_PRIVATE (widget);
  55 -  GtkNotebook *notebook = GTK_NOTEBOOK (widget);
  56 -  GtkWidget *child, *event_widget;
  57 -  gint i;
  58 -
  59 -  if (!notebook->cur_page)
  60 -    return FALSE;
  61 -
  62 -  child = notebook->cur_page->child;
  63 -  event_widget = gtk_get_event_widget ((GdkEvent *)event);
  64 -
  65 -  /* ignore scroll events from the content of the page */
  66 -  if (!event_widget || gtk_widget_is_ancestor (event_widget, child) || event_widget == child)
  67 -    return FALSE;
  68 -
  69 -  /* nor from the action area */
  70 -  for (i = 0; i < 2; i++)
  71 -    {
  72 -      if (event_widget == priv->action_widget[i] ||
  73 -          (priv->action_widget[i] &&
  74 -           gtk_widget_is_ancestor (event_widget, priv->action_widget[i])))
  75 -        return FALSE;
  76 -    }
  77 -
  78 -  switch (event->direction)
  79 -    {
  80 -    case GDK_SCROLL_RIGHT:
  81 -    case GDK_SCROLL_DOWN:
  82 -      gtk_notebook_next_page (notebook);
  83 -      break;
  84 -    case GDK_SCROLL_LEFT:
  85 -    case GDK_SCROLL_UP:
  86 -      gtk_notebook_prev_page (notebook);
  87 -      break;
  88 -    }
  89 -
  90 -  return TRUE;
  91 -}
  92 -
  93  static GList*
  94  get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
  95  {