X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..d7926e0b761b782b82f9ef01ff542251b2ef5ae7:/include/wx/scrolwin.h?ds=sidebyside

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 154e7286c0..c85b28e568 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -112,7 +112,9 @@ public:
     void HandleOnChar(wxKeyEvent& event);
     void HandleOnMouseEnter(wxMouseEvent& event);
     void HandleOnMouseLeave(wxMouseEvent& event);
+#if wxUSE_MOUSEWHEEL
     void HandleOnMouseWheel(wxMouseEvent& event);
+#endif // wxUSE_MOUSEWHEEL
 
 protected:
     // get pointer to our scroll rect if we use it or NULL
@@ -158,13 +160,17 @@ protected:
 
     double                m_scaleX;
     double                m_scaleY;
+
+#if wxUSE_MOUSEWHEEL
+    int m_wheelRotation;
+#endif // wxUSE_MOUSEWHEEL
 };
 
 // ----------------------------------------------------------------------------
 // wxScrolledWindow: a wxWindow which knows how to scroll
 // ----------------------------------------------------------------------------
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/scrolwin.h"
 #else // !wxGTK
     #include "wx/generic/scrolwin.h"