X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..a2482628795b7de454ef093cb24910c98ad51f1d:/wxPython/src/_panel.i

diff --git a/wxPython/src/_panel.i b/wxPython/src/_panel.i
index 0fb5d8fa1c..76a7fb4d5f 100644
--- a/wxPython/src/_panel.i
+++ b/wxPython/src/_panel.i
@@ -25,8 +25,8 @@
 class wxPanel : public wxWindow
 {
 public:
-    %addtofunc wxPanel         "self._setOORInfo(self)"
-    %addtofunc wxPanel()       ""
+    %pythonAppend wxPanel         "self._setOORInfo(self)"
+    %pythonAppend wxPanel()       ""
 
     wxPanel(wxWindow* parent,
             const wxWindowID id=-1,
@@ -58,8 +58,8 @@ public:
 class wxScrolledWindow : public wxPanel
 {
 public:
-    %addtofunc wxScrolledWindow         "self._setOORInfo(self)"
-    %addtofunc wxScrolledWindow()       ""
+    %pythonAppend wxScrolledWindow         "self._setOORInfo(self)"
+    %pythonAppend wxScrolledWindow()       ""
 
     wxScrolledWindow(wxWindow* parent,
                      const wxWindowID id = -1,
@@ -93,13 +93,10 @@ public:
     // Set the x, y scrolling increments.
     void SetScrollRate( int xstep, int ystep );
 
-    %feature("autodoc") GetScrollPixelsPerUnit
-    "GetScrollPixelsPerUnit() -> (xUnit, yUnit)";
-    %feature("docstring") GetScrollPixelsPerUnit "
-        get the size of one logical unit in physical ones
-        "
-    virtual void GetScrollPixelsPerUnit(int *OUTPUT,
-                                        int *OUTPUT) const;
+    DocDeclAStr(
+        virtual void, GetScrollPixelsPerUnit(int *OUTPUT, int *OUTPUT) const,
+        "GetScrollPixelsPerUnit() -> (xUnit, yUnit)",
+        "Get the size of one logical unit in physical units.");
 
     // Enable/disable Windows scrolling in either direction. If True, wxWindows
     // scrolls the canvas and only a bit of the canvas is invalidated; no
@@ -108,9 +105,12 @@ public:
     // actually scroll a non-constant distance
     virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
 
-    // Get the view start
-    virtual void GetViewStart(int *OUTPUT, int *OUTPUT) const;
 
+    DocDeclAStr( 
+        virtual void, GetViewStart(int *OUTPUT, int *OUTPUT) const,
+        "GetViewStart() -> (x,y)",
+        "Get the view start");
+    
     // Set the scale factor, used in PrepareDC
     void SetScale(double xs, double ys);
     double GetScaleX() const;
@@ -120,12 +120,21 @@ public:
     %nokwargs CalcScrolledPosition;
     %nokwargs CalcUnscrolledPosition;
     
-    // translate between scrolled and unscrolled coordinates
-    void CalcScrolledPosition(int x, int y, int *OUTPUT, int *OUTPUT) const;
+    DocStr(CalcScrolledPosition, "Translate between scrolled and unscrolled coordinates.");
     wxPoint CalcScrolledPosition(const wxPoint& pt) const;
-    void CalcUnscrolledPosition(int x, int y, int *OUTPUT, int *OUTPUT) const;
+    DocDeclA(
+        void, CalcScrolledPosition(int x, int y, int *OUTPUT, int *OUTPUT) const,
+        "CalcScrolledPosition(int x, int y) -> (sx, sy)");
+
+    
+    DocStr(CalcUnscrolledPosition, "Translate between scrolled and unscrolled coordinates.");
     wxPoint CalcUnscrolledPosition(const wxPoint& pt) const;
+    DocDeclA(
+        void, CalcUnscrolledPosition(int x, int y, int *OUTPUT, int *OUTPUT) const,
+        "CalcUnscrolledPosition(int x, int y) -> (ux, uy)");
 
+
+    
 // TODO: use directors?
 //     virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
 //     virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;