A few tweaks and cleanups

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index efdf0199ef9213a7cabbac86c031c51c96d2dbd2..2986a6c9c4e5f60380e058768c5727884882a3e4 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -67,8 +67,26 @@ public:
     double GetScaleY() const { return m_scaleY; }
 
     // translate between scrolled and unscrolled coordinates
     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);
 
     // 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);
 
     // 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);
     void HandleOnSize(wxSizeEvent& event);
     void HandleOnPaint(wxPaintEvent& event);
     void HandleOnChar(wxKeyEvent& event);


@@ -118,6 +135,10 @@ public:
     void HandleOnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
 
     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); }
+

 protected:
     // get pointer to our scroll rect if we use it or NULL
     const wxRect *GetRect() const
 protected:
     // get pointer to our scroll rect if we use it or NULL
     const wxRect *GetRect() const