[gnumeric] Fix scolling via mouse wheels [#533051]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 8cb7ad417306af5afcb9c2d3c1125819b8906434
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Wed Jun 10 23:46:42 2009 -0600

    Fix scolling via mouse wheels [#533051]
    
    2009-06-10  Andreas J. Guelzow <aguelzow pyrshep ca>
    	for Almer S. Tigelaar
    
    	* src/wbc-gtk.c (cb_scroll_wheel): make sure we are acting on
    	  the top visible sheet
---
 ChangeLog     |    6 ++++++
 NEWS          |    3 +++
 src/wbc-gtk.c |    8 ++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f932ca..71f9afc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-10  Andreas J. Guelzow <aguelzow pyrshep ca>
+	for Almer S. Tigelaar
+	
+	* src/wbc-gtk.c (cb_scroll_wheel): make sure we are acting on 
+	  the top visible sheet
+
 2009-06-10  Morten Welinder  <terra gnome org>
 
 	* src/parser.y (yylex): Return LEFT_EXP_TOKEN or RIGHT_EXP_TOKEN
diff --git a/NEWS b/NEWS
index df67e58..f455615 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.9.9
 
+Almer S. Tigelaar:
+        * Fix scolling via mouse wheels [#533051]
+
 Andreas:
 	* Export some data formats to ODF.
 	* Fix comment export to ODF.
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index dc1a495..3c5dc71 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1858,19 +1858,19 @@ cb_set_focus (GtkWindow *window, GtkWidget *focus, WBCGtk *wbcg)
 /***************************************************************************/
 
 static gboolean
-cb_scroll_wheel (GtkWidget *ignored, GdkEventScroll *event,
+cb_scroll_wheel (GtkWidget *w, GdkEventScroll *event,
 		 WBCGtk *wbcg)
 {
-	/* scroll always operates on pane 0 */
-	SheetControlGUI *scg = wbcg_cur_scg (wbcg);
+	SheetControlGUI *scg = wbcg_get_scg (wbcg, wbcg_focus_cur_scg (wbcg));
 	Sheet		*sheet = scg_sheet (scg);
+	/* scroll always operates on pane 0 */
 	GnmPane *pane = scg_pane (scg, 0);
 	gboolean go_horiz = (event->direction == GDK_SCROLL_LEFT ||
 			     event->direction == GDK_SCROLL_RIGHT);
 	gboolean go_back = (event->direction == GDK_SCROLL_UP ||
 			    event->direction == GDK_SCROLL_LEFT);
 
-	if (!GTK_WIDGET_REALIZED (ignored))
+	if (!GTK_WIDGET_REALIZED (w))
 		return FALSE;
 
 	if ((event->state & GDK_MOD1_MASK))