--- a/gtk/gtknotebook.c 2012-04-13 13:25:05.000000000 +0300 +++ b/gtk/gtknotebook.c 2012-04-13 13:44:20.000000000 +0300 @@ -304,6 +304,9 @@ GtkWidget *child, gboolean *expand, gboolean *fill); +static gboolean gtk_notebook_scroll (GtkWidget *widget, + GdkEventScroll *event); + /*** GObject Methods ***/ static void gtk_notebook_set_property (GObject *object, @@ -665,6 +668,7 @@ widget_class->drag_data_received = gtk_notebook_drag_data_received; widget_class->drag_failed = gtk_notebook_drag_failed; widget_class->compute_expand = gtk_notebook_compute_expand; + widget_class->scroll_event = gtk_notebook_scroll; container_class->add = gtk_notebook_add; container_class->remove = gtk_notebook_remove; @@ -1893,7 +1897,8 @@ attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | - GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK); + GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK | + GDK_SCROLL_MASK); attributes_mask = GDK_WA_X | GDK_WA_Y; priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget), @@ -2858,6 +2863,52 @@ return FALSE; } +static gboolean +gtk_notebook_scroll (GtkWidget *widget, + GdkEventScroll *event) +{ + GtkNotebook *notebook = GTK_NOTEBOOK (widget); + GtkNotebookPrivate *priv = notebook->priv; + GtkWidget *child, *event_widget; + gint i; + + if (!priv->cur_page) + return FALSE; + + child = priv->cur_page->child; + event_widget = gtk_get_event_widget ((GdkEvent *)event); + + /* ignore scroll events from the content of the page */ + if (!event_widget || gtk_widget_is_ancestor (event_widget, child) || event_widget == child) + return FALSE; + + /* nor from the action area */ + for (i = 0; i < 2; i++) + { + if (event_widget == priv->action_widget[i] || + (priv->action_widget[i] && + gtk_widget_is_ancestor (event_widget, priv->action_widget[i]))) + return FALSE; + } + + switch (event->direction) + { + case GDK_SCROLL_RIGHT: + case GDK_SCROLL_DOWN: + gtk_notebook_next_page (notebook); + break; + case GDK_SCROLL_LEFT: + case GDK_SCROLL_UP: + gtk_notebook_prev_page (notebook); + break; + case GDK_SCROLL_SMOOTH: + /* Ignore smooth scrolling (-Wswitch) */ + break; + } + + return TRUE; +} + static GList* get_tab_at_pos (GtkNotebook *notebook, gint x, gint y) {