wx.lib.masked: Patch from Will Sadkin. Includes Unicode fixes, plus

[wxWidgets.git] / wxPython / src / mac / aui.py

diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py
index 76b76eeb0f89423b3d9805a18f88664a57bac1cc..f41f22e46bb81db60e037bb5992eb7d72494c653 100644 (file)
--- a/wxPython/src/mac/aui.py
+++ b/wxPython/src/mac/aui.py
@@ -1138,25 +1138,19 @@ class AuiTabArt(object):
 
     def DrawTab(*args, **kwargs):
         """
-        DrawTab(self, DC dc, Window wnd, Rect in_rect, String caption, Bitmap bitmap, 
-            bool active, int close_button_state, 
-            Rect out_tab_rect, Rect out_button_rect, 
-            int x_extent)
+        DrawTab(self, DC dc, Window wnd, AuiNotebookPage pane, Rect in_rect, 
+            int close_button_state, Rect out_tab_rect, 
+            Rect out_button_rect, int x_extent)
         """
         return _aui.AuiTabArt_DrawTab(*args, **kwargs)
 
     def DrawButton(*args, **kwargs):
         """
         DrawButton(self, DC dc, Window wnd, Rect in_rect, int bitmap_id, int button_state, 
-            int orientation, Bitmap bitmap_override, 
-            Rect out_rect)
+            int orientation, Rect out_rect)
         """
         return _aui.AuiTabArt_DrawButton(*args, **kwargs)
 
-    def GetIndentSize(*args, **kwargs):
-        """GetIndentSize(self) -> int"""
-        return _aui.AuiTabArt_GetIndentSize(*args, **kwargs)
-
     def GetTabSize(*args, **kwargs):
         """
         GetTabSize(self, DC dc, Window wnd, String caption, Bitmap bitmap, bool active, 
@@ -1164,9 +1158,13 @@ class AuiTabArt(object):
         """
         return _aui.AuiTabArt_GetTabSize(*args, **kwargs)
 
-    def ShowWindowList(*args, **kwargs):
-        """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int"""
-        return _aui.AuiTabArt_ShowWindowList(*args, **kwargs)
+    def ShowDropDown(*args, **kwargs):
+        """ShowDropDown(self, Window wnd, wxAuiNotebookPageArray items, int active_idx) -> int"""
+        return _aui.AuiTabArt_ShowDropDown(*args, **kwargs)
+
+    def GetIndentSize(*args, **kwargs):
+        """GetIndentSize(self) -> int"""
+        return _aui.AuiTabArt_GetIndentSize(*args, **kwargs)
 
     def GetBestTabCtrlSize(*args, **kwargs):
         """GetBestTabCtrlSize(self, Window wnd, wxAuiNotebookPageArray pages, Size required_bmp_size) -> int"""
@@ -1272,9 +1270,12 @@ class AuiTabContainer(object):
         """GetPageCount(self) -> size_t"""
         return _aui.AuiTabContainer_GetPageCount(*args, **kwargs)
 
-    def GetPage(*args, **kwargs):
-        """GetPage(self, size_t idx) -> AuiNotebookPage"""
-        return _aui.AuiTabContainer_GetPage(*args, **kwargs)
+    def GetPage(*args):
+        """
+        GetPage(self, size_t idx) -> AuiNotebookPage
+        GetPage(self, size_t idx) -> AuiNotebookPage
+        """
+        return _aui.AuiTabContainer_GetPage(*args)
 
     def GetPages(*args, **kwargs):
         """GetPages(self) -> wxAuiNotebookPageArray"""
@@ -1363,6 +1364,22 @@ class AuiNotebook(_core.Control):
         """
         return _aui.AuiNotebook_Create(*args, **kwargs)
 
+    def SetArtProvider(*args, **kwargs):
+        """SetArtProvider(self, AuiTabArt art)"""
+        return _aui.AuiNotebook_SetArtProvider(*args, **kwargs)
+
+    def GetArtProvider(*args, **kwargs):
+        """GetArtProvider(self) -> AuiTabArt"""
+        return _aui.AuiNotebook_GetArtProvider(*args, **kwargs)
+
+    def SetUniformBitmapSize(*args, **kwargs):
+        """SetUniformBitmapSize(self, Size size)"""
+        return _aui.AuiNotebook_SetUniformBitmapSize(*args, **kwargs)
+
+    def SetTabCtrlHeight(*args, **kwargs):
+        """SetTabCtrlHeight(self, int height)"""
+        return _aui.AuiNotebook_SetTabCtrlHeight(*args, **kwargs)
+
     def AddPage(*args, **kwargs):
         """AddPage(self, Window page, String caption, bool select=False, Bitmap bitmap=wxNullBitmap) -> bool"""
         return _aui.AuiNotebook_AddPage(*args, **kwargs)
@@ -1382,14 +1399,34 @@ class AuiNotebook(_core.Control):
         """RemovePage(self, size_t page) -> bool"""
         return _aui.AuiNotebook_RemovePage(*args, **kwargs)
 
+    def GetPageCount(*args, **kwargs):
+        """GetPageCount(self) -> size_t"""
+        return _aui.AuiNotebook_GetPageCount(*args, **kwargs)
+
+    def GetPage(*args, **kwargs):
+        """GetPage(self, size_t page_idx) -> Window"""
+        return _aui.AuiNotebook_GetPage(*args, **kwargs)
+
+    def GetPageIndex(*args, **kwargs):
+        """GetPageIndex(self, Window page_wnd) -> int"""
+        return _aui.AuiNotebook_GetPageIndex(*args, **kwargs)
+
     def SetPageText(*args, **kwargs):
         """SetPageText(self, size_t page, String text) -> bool"""
         return _aui.AuiNotebook_SetPageText(*args, **kwargs)
 
+    def GetPageText(*args, **kwargs):
+        """GetPageText(self, size_t page_idx) -> String"""
+        return _aui.AuiNotebook_GetPageText(*args, **kwargs)
+
     def SetPageBitmap(*args, **kwargs):
         """SetPageBitmap(self, size_t page, Bitmap bitmap) -> bool"""
         return _aui.AuiNotebook_SetPageBitmap(*args, **kwargs)
 
+    def GetPageBitmap(*args, **kwargs):
+        """GetPageBitmap(self, size_t page_idx) -> Bitmap"""
+        return _aui.AuiNotebook_GetPageBitmap(*args, **kwargs)
+
     def SetSelection(*args, **kwargs):
         """SetSelection(self, size_t new_page) -> size_t"""
         return _aui.AuiNotebook_SetSelection(*args, **kwargs)
@@ -1398,33 +1435,9 @@ class AuiNotebook(_core.Control):
         """GetSelection(self) -> int"""
         return _aui.AuiNotebook_GetSelection(*args, **kwargs)
 
-    def GetPageCount(*args, **kwargs):
-        """GetPageCount(self) -> size_t"""
-        return _aui.AuiNotebook_GetPageCount(*args, **kwargs)
-
-    def GetPage(*args, **kwargs):
-        """GetPage(self, size_t page_idx) -> Window"""
-        return _aui.AuiNotebook_GetPage(*args, **kwargs)
-
-    def GetPageIndex(*args, **kwargs):
-        """GetPageIndex(self, Window page_wnd) -> int"""
-        return _aui.AuiNotebook_GetPageIndex(*args, **kwargs)
-
-    def SetArtProvider(*args, **kwargs):
-        """SetArtProvider(self, AuiTabArt art)"""
-        return _aui.AuiNotebook_SetArtProvider(*args, **kwargs)
-
-    def GetArtProvider(*args, **kwargs):
-        """GetArtProvider(self) -> AuiTabArt"""
-        return _aui.AuiNotebook_GetArtProvider(*args, **kwargs)
-
-    def SetUniformBitmapSize(*args, **kwargs):
-        """SetUniformBitmapSize(self, Size size)"""
-        return _aui.AuiNotebook_SetUniformBitmapSize(*args, **kwargs)
-
-    def SetTabCtrlHeight(*args, **kwargs):
-        """SetTabCtrlHeight(self, int height)"""
-        return _aui.AuiNotebook_SetTabCtrlHeight(*args, **kwargs)
+    def Split(*args, **kwargs):
+        """Split(self, size_t page, int direction)"""
+        return _aui.AuiNotebook_Split(*args, **kwargs)
 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`")