Updates to fix an error that cropped up putting EMX stuff into gsocket and a new...

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 2d3fc4c7ab147b1c777532b4466985a1cbfb648d..a7cb687f544b7f7e4dd48414d69ac05d097ad3e8 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1627,7 +1627,7 @@ static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
 
 static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
                                                  GdkEventButton *WXUNUSED(gdk_event),
-                                                 wxWindow *WXUNUSED(win))
+                                                 wxWindow *win)
 {
     DEBUG_MAIN_THREAD
 
@@ -1640,6 +1640,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
 //    if (gdk_event->window != widget->slider) return FALSE;
 
     g_blockEventsOnScroll = TRUE;
+    win->m_isScrolling = TRUE;
 
     return FALSE;
 }
@@ -1650,7 +1651,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
 
 static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
                                                    GdkEventButton *WXUNUSED(gdk_event),
-                                                   wxWindow *WXUNUSED(win))
+                                                   wxWindow *win)
 {
     DEBUG_MAIN_THREAD
 
@@ -1661,6 +1662,7 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 //    if (gdk_event->window != widget->slider) return FALSE;
 
     g_blockEventsOnScroll = FALSE;
+    win->m_isScrolling = FALSE;
 
     return FALSE;
 }
@@ -1926,6 +1928,7 @@ void wxWindow::Init()
     m_nativeSizeEvent = FALSE;
 
     m_hasScrolling = FALSE;
+    m_isScrolling = FALSE;
 
     m_hAdjust = (GtkAdjustment*) NULL;
     m_vAdjust = (GtkAdjustment*) NULL;