regenerated after bakefile change to always create shared-ld-sh under Darwin

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index aae769bea40d8d218055344d4180cd9fe12ce0bf..f7614dbd1d446414e4388f0cfaa22885a360dfd9 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -140,11 +140,6 @@ public:
     //        once it is fixed!
     void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
 
-#if WXWIN_COMPATIBILITY_2_2
-    // Compatibility only, don't use
-    void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
-#endif // WXWIN_COMPATIBILITY_2_2
-
 protected:
     // get pointer to our scroll rect if we use it or NULL
     const wxRect *GetScrollRect() const
@@ -175,6 +170,9 @@ protected:
     // delete the event handler we installed
     void DeleteEvtHandler();
 
+    double                m_scaleX;
+    double                m_scaleY;
+
     wxWindow             *m_win,
                          *m_targetWindow;
 
@@ -194,9 +192,6 @@ protected:
     bool                  m_xScrollingEnabled;
     bool                  m_yScrollingEnabled;
 
-    double                m_scaleX;
-    double                m_scaleY;
-
 #if wxUSE_MOUSEWHEEL
     int m_wheelRotation;
 #endif // wxUSE_MOUSEWHEEL