MSW fixes; added wxUSE_XPM to wxUniv's setup.h so now widgets sample works

[wxWidgets.git] / include / wx / scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 154e7286c0360e5626d3b143d0eb979d90de6b5b..9464b6973d432c893f3684a0883bde895fd387b6 100644 (file)
--- 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);
     void HandleOnChar(wxKeyEvent& event);
     void HandleOnMouseEnter(wxMouseEvent& event);
     void HandleOnMouseLeave(wxMouseEvent& event);

+#if wxUSE_MOUSEWHEEL

     void HandleOnMouseWheel(wxMouseEvent& event);
     void HandleOnMouseWheel(wxMouseEvent& event);

+#endif // wxUSE_MOUSEWHEEL

 
 protected:
     // get pointer to our scroll rect if we use it or NULL
 
 protected:
     // get pointer to our scroll rect if we use it or NULL


@@ -158,6 +160,10 @@ protected:
 
     double                m_scaleX;
     double                m_scaleY;
 
     double                m_scaleX;
     double                m_scaleY;

+
+#if wxUSE_MOUSEWHEEL
+    int m_wheelRotation;
+#endif // wxUSE_MOUSEWHEEL

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------