fixed several bugs in Mkdir() and also modified its API to be more user friendly...

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

diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h
index 96688d1ab913ce39942be6f38d1834effad43f5c..9d9c0d9a6e563e7093cfa48cae16cc7b0c475146 100644 (file)
--- a/include/wx/gtk/scrolwin.h
+++ b/include/wx/gtk/scrolwin.h
@@ -98,8 +98,27 @@ public:
     // Actual size in pixels when scrolling is taken into account
     virtual void GetVirtualSize(int *x, int *y) const;
 
     // Actual size in pixels when scrolling is taken into account
     virtual void GetVirtualSize(int *x, int *y) const;
 

-    virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
+    // translate between scrolled and unscrolled coordinates
+    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;

 
     // Override this function to draw the graphic (or just process EVT_PAINT)
     virtual void OnDraw(wxDC& WXUNUSED(dc)) {}
 
     // Override this function to draw the graphic (or just process EVT_PAINT)
     virtual void OnDraw(wxDC& WXUNUSED(dc)) {}