3 --- src/gtk/MainView.cxx.orig 2009-02-28 13:00:55.000000000 -0800
4 +++ src/gtk/MainView.cxx 2009-08-14 16:10:10.000000000 -0700
5 @@ -77,7 +77,7 @@ static void main_window_zoom_in_cb (GtkW
6 static void main_window_zoom_out_cb (GtkWidget *, gpointer);
7 static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
8 static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
9 -static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
10 +static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
12 #if defined (HAVE_CUPS)
13 static void main_window_print_cb (GtkWidget *, gpointer);
14 @@ -1479,18 +1479,25 @@ main_window_set_page_mode (GtkRadioActio
15 pter->setPageMode (mode);
20 main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
22 g_assert ( NULL != data && "The data parameter is NULL.");
24 MainPter *pter = (MainPter *)data;
25 // Only zoom when the CTRL-Button is down...
26 - if ( !(event->state & GDK_CONTROL_MASK) ) return;
27 - if ( event->direction == GDK_SCROLL_UP ) {
28 - pter->zoomInActivated ();
29 - } else if ( event->direction == GDK_SCROLL_DOWN ) {
30 - pter->zoomOutActivated ();
31 + if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )
33 + if ( event->direction == GDK_SCROLL_UP )
35 + pter->zoomInActivated ();
37 + else if ( event->direction == GDK_SCROLL_DOWN )
39 + pter->zoomOutActivated ();