X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/423f194a1411e8aac372de29ef4a7ab5f90acb04..ff9ca1fd6fe7484adf7361b0e64df8cc34f8b842:/wxPython/src/mac/windows.py

diff --git a/wxPython/src/mac/windows.py b/wxPython/src/mac/windows.py
index 196f9371ec..51f3180f6f 100644
--- a/wxPython/src/mac/windows.py
+++ b/wxPython/src/mac/windows.py
@@ -91,9 +91,7 @@ class ScrolledWindow(Panel):
     def GetScrollPixelsPerUnit(*args, **kwargs):
         """GetScrollPixelsPerUnit() -> (xUnit, yUnit)
 
-
-        get the size of one logical unit in physical ones
-        """
+Get the size of one logical unit in physical units."""
         return _windows.ScrolledWindow_GetScrollPixelsPerUnit(*args, **kwargs)
 
     def EnableScrolling(*args, **kwargs):
@@ -101,7 +99,9 @@ class ScrolledWindow(Panel):
         return _windows.ScrolledWindow_EnableScrolling(*args, **kwargs)
 
     def GetViewStart(*args, **kwargs):
-        """GetViewStart(int OUTPUT, int OUTPUT)"""
+        """GetViewStart() -> (x,y)
+
+Get the view start"""
         return _windows.ScrolledWindow_GetViewStart(*args, **kwargs)
 
     def SetScale(*args, **kwargs):
@@ -117,13 +117,17 @@ class ScrolledWindow(Panel):
         return _windows.ScrolledWindow_GetScaleY(*args, **kwargs)
 
     def CalcScrolledPosition(*args):
-        """CalcScrolledPosition(int x, int y, int OUTPUT, int OUTPUT)
-CalcScrolledPosition(Point pt) -> Point"""
+        """CalcScrolledPosition(Point pt) -> Point
+CalcScrolledPosition(int x, int y) -> (sx, sy)
+
+Translate between scrolled and unscrolled coordinates."""
         return _windows.ScrolledWindow_CalcScrolledPosition(*args)
 
     def CalcUnscrolledPosition(*args):
-        """CalcUnscrolledPosition(int x, int y, int OUTPUT, int OUTPUT)
-CalcUnscrolledPosition(Point pt) -> Point"""
+        """CalcUnscrolledPosition(Point pt) -> Point
+CalcUnscrolledPosition(int x, int y) -> (ux, uy)
+
+Translate between scrolled and unscrolled coordinates."""
         return _windows.ScrolledWindow_CalcUnscrolledPosition(*args)
 
     def AdjustScrollbars(*args, **kwargs):
@@ -661,7 +665,7 @@ class StatusBar(core.Window):
         return _windows.StatusBar_SetStatusWidths(*args, **kwargs)
 
     def GetFieldRect(*args, **kwargs):
-        """GetFieldRect(int i, Rect rect) -> bool"""
+        """GetFieldRect(int i) -> Rect"""
         return _windows.StatusBar_GetFieldRect(*args, **kwargs)
 
     def SetMinHeight(*args, **kwargs):
@@ -2459,15 +2463,15 @@ class PyWindow(core.Window):
         return _windows.PyWindow_base_DoSetVirtualSize(*args, **kwargs)
 
     def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetSize() -> (width, height)"""
         return _windows.PyWindow_base_DoGetSize(*args, **kwargs)
 
     def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetClientSize() -> (width, height)"""
         return _windows.PyWindow_base_DoGetClientSize(*args, **kwargs)
 
     def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        """base_DoGetPosition() -> (x,y)"""
         return _windows.PyWindow_base_DoGetPosition(*args, **kwargs)
 
     def base_DoGetVirtualSize(*args, **kwargs):
@@ -2556,15 +2560,15 @@ class PyPanel(Panel):
         return _windows.PyPanel_base_DoSetVirtualSize(*args, **kwargs)
 
     def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetSize() -> (width, height)"""
         return _windows.PyPanel_base_DoGetSize(*args, **kwargs)
 
     def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize(int OUTPUT, int OUTPUT)"""
+        """base_DoGetClientSize() -> (width, height)"""
         return _windows.PyPanel_base_DoGetClientSize(*args, **kwargs)
 
     def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition(int OUTPUT, int OUTPUT)"""
+        """base_DoGetPosition() -> (x,y)"""
         return _windows.PyPanel_base_DoGetPosition(*args, **kwargs)
 
     def base_DoGetVirtualSize(*args, **kwargs):
@@ -3256,20 +3260,20 @@ class Printout(core.Object):
         """SetDC(wxDC dc)"""
         return _windows.Printout_SetDC(*args, **kwargs)
 
-    def GetPageSizePixels(*args, **kwargs):
-        """GetPageSizePixels(int OUTPUT, int OUTPUT)"""
-        return _windows.Printout_GetPageSizePixels(*args, **kwargs)
-
     def SetPageSizePixels(*args, **kwargs):
         """SetPageSizePixels(int w, int h)"""
         return _windows.Printout_SetPageSizePixels(*args, **kwargs)
 
+    def GetPageSizePixels(*args, **kwargs):
+        """GetPageSizePixels() -> (w, h)"""
+        return _windows.Printout_GetPageSizePixels(*args, **kwargs)
+
     def SetPageSizeMM(*args, **kwargs):
         """SetPageSizeMM(int w, int h)"""
         return _windows.Printout_SetPageSizeMM(*args, **kwargs)
 
     def GetPageSizeMM(*args, **kwargs):
-        """GetPageSizeMM(int OUTPUT, int OUTPUT)"""
+        """GetPageSizeMM() -> (w, h)"""
         return _windows.Printout_GetPageSizeMM(*args, **kwargs)
 
     def SetPPIScreen(*args, **kwargs):
@@ -3277,7 +3281,7 @@ class Printout(core.Object):
         return _windows.Printout_SetPPIScreen(*args, **kwargs)
 
     def GetPPIScreen(*args, **kwargs):
-        """GetPPIScreen(int OUTPUT, int OUTPUT)"""
+        """GetPPIScreen() -> (x,y)"""
         return _windows.Printout_GetPPIScreen(*args, **kwargs)
 
     def SetPPIPrinter(*args, **kwargs):
@@ -3285,7 +3289,7 @@ class Printout(core.Object):
         return _windows.Printout_SetPPIPrinter(*args, **kwargs)
 
     def GetPPIPrinter(*args, **kwargs):
-        """GetPPIPrinter(int OUTPUT, int OUTPUT)"""
+        """GetPPIPrinter() -> (x,y)"""
         return _windows.Printout_GetPPIPrinter(*args, **kwargs)
 
     def IsPreview(*args, **kwargs):
@@ -3316,14 +3320,14 @@ class Printout(core.Object):
         """base_OnPreparePrinting()"""
         return _windows.Printout_base_OnPreparePrinting(*args, **kwargs)
 
-    def base_GetPageInfo(*args, **kwargs):
-        """base_GetPageInfo(int OUTPUT, int OUTPUT, int OUTPUT, int OUTPUT)"""
-        return _windows.Printout_base_GetPageInfo(*args, **kwargs)
-
     def base_HasPage(*args, **kwargs):
         """base_HasPage(int page) -> bool"""
         return _windows.Printout_base_HasPage(*args, **kwargs)
 
+    def base_GetPageInfo(*args, **kwargs):
+        """base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"""
+        return _windows.Printout_base_GetPageInfo(*args, **kwargs)
+
 
 class PrintoutPtr(Printout):
     def __init__(self, this):
@@ -3344,7 +3348,7 @@ class PreviewCanvas(ScrolledWindow):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-        self._self._setOORInfo(self)
+        self._setOORInfo(self)
 
 
 class PreviewCanvasPtr(PreviewCanvas):
@@ -3366,7 +3370,7 @@ class PreviewFrame(Frame):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-        self._self._setOORInfo(self)
+        self._setOORInfo(self)
 
     def Initialize(*args, **kwargs):
         """Initialize()"""
@@ -3420,7 +3424,7 @@ class PreviewControlBar(Panel):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-        self._self._setOORInfo(self)
+        self._setOORInfo(self)
 
     def GetZoomControl(*args, **kwargs):
         """GetZoomControl() -> int"""