X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13ff9344d600ab38ad5ad4088d4a4797184405d2..19e30148e18cc99296b26503c155e5cef59045f4:/include/wx/scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 8bf0404a25..2986a6c9c4 100644
--- 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
-    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);
@@ -80,7 +98,7 @@ public:
     // occasions you might want it to scroll [part of] another window (e.g. a
     // child of it in order to scroll only a portion the area between the
     // scrollbars (spreadsheet: only cell area will move).
-    virtual void SetTargetWindow(wxWindow *target, bool pushEventHandler = FALSE);
+    virtual void SetTargetWindow(wxWindow *target);
     virtual wxWindow *GetTargetWindow() const;
 
     void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; }
@@ -146,7 +164,7 @@ protected:
 
     // change just the target window (unlike SetWindow which changes m_win as
     // well)
-    void DoSetTargetWindow(wxWindow *target, bool pushEventHandler = FALSE);
+    void DoSetTargetWindow(wxWindow *target);
 
     // delete the event handler we installed
     void DeleteEvtHandler();