wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / generic / vscroll.cpp

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index c6e714afbedd3bb332387035e0abcbdc275cf437..efbef67e3344e8953c598ea2e733dbdd28e4c1a4 100644 (file)
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -137,10 +137,13 @@ bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
         }
     }
 #if wxUSE_MOUSEWHEEL
         }
     }
 #if wxUSE_MOUSEWHEEL

+    // Use GTK's own scroll wheel handling in GtkScrolledWindow
+#ifndef __WXGTK20__

     else if ( evType == wxEVT_MOUSEWHEEL )
     {
         m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
     }
     else if ( evType == wxEVT_MOUSEWHEEL )
     {
         m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
     }

+#endif

 #endif // wxUSE_MOUSEWHEEL
     else if ( evType == wxEVT_CHAR &&
                 (m_scrollHelper->GetOrientation() == wxVERTICAL) )
 #endif // wxUSE_MOUSEWHEEL
     else if ( evType == wxEVT_CHAR &&
                 (m_scrollHelper->GetOrientation() == wxVERTICAL) )