Derive wxScrollBar from wxScrollBarBase, plus miscellaneous

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index efdf0199ef9213a7cabbac86c031c51c96d2dbd2..e4c0a96763b14745f04f0e37298ed0e09846e82c 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -44,6 +44,9 @@ public:
     int GetScrollPageSize(int orient) const;
     void SetScrollPageSize(int orient, int pageSize);
 
+    // Set the x, y scrolling increments.
+    void SetScrollRate( int xstep, int ystep );
+
     // get the size of one logical unit in physical ones
     virtual void GetScrollPixelsPerUnit(int *pixelsPerUnitX,
                                         int *pixelsPerUnitY) const;
@@ -58,17 +61,32 @@ public:
     // Get the view start
     virtual void GetViewStart(int *x, int *y) const;
 
-    // Actual size in pixels when scrolling is taken into account
-    virtual void GetVirtualSize(int *x, int *y) const;
-
     // Set the scale factor, used in PrepareDC
     void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; }
     double GetScaleX() const { return m_scaleX; }
     double GetScaleY() const { return m_scaleY; }
 
     // translate between scrolled and unscrolled coordinates
-    virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
+    void CalcScrolledPosition(int x, int y, int *xx, int *yy) const
+        {  DoCalcScrolledPosition(x, y, xx, yy); }
+    wxPoint CalcScrolledPosition(const wxPoint& pt) const
+    {
+        wxPoint p2;
+        DoCalcScrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
+        return p2;
+    }
+
+    void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
+        {  DoCalcUnscrolledPosition(x, y, xx, yy); }
+    wxPoint CalcUnscrolledPosition(const wxPoint& pt) const
+    {
+        wxPoint p2;
+        DoCalcUnscrolledPosition(pt.x, pt.y, &p2.x, &p2.y);
+        return p2;
+    }
+
+    virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
+    virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
 
     // Adjust the scrollbars
     virtual void AdjustScrollbars(void);
@@ -108,7 +126,6 @@ public:
 
     // the methods to be called from the window event handlers
     void HandleOnScroll(wxScrollWinEvent& event);
-    void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
     void HandleOnSize(wxSizeEvent& event);
     void HandleOnPaint(wxPaintEvent& event);
     void HandleOnChar(wxKeyEvent& event);
@@ -118,6 +135,15 @@ public:
     void HandleOnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
 
+    // FIXME: this is needed for now for wxPlot compilation, should be removed
+    //        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 *GetRect() const
@@ -175,6 +201,8 @@ protected:
 #endif // wxUSE_MOUSEWHEEL
 
     wxScrollHelperEvtHandler *m_handler;
+
+    DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };
 
 // ----------------------------------------------------------------------------
@@ -209,3 +237,5 @@ protected:
 
 #endif
     // _WX_SCROLWIN_H_BASE_
+
+// vi:sts=4:sw=4:et