bitwise vs. logical operator

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

diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py
index aa3523992b19c6356ca45c5d2824c51940a01d37..f41f22e46bb81db60e037bb5992eb7d72494c653 100644 (file)
--- a/wxPython/src/gtk/aui.py
+++ b/wxPython/src/gtk/aui.py
@@ -482,14 +482,6 @@ class AuiPaneInfo(object):
         """Movable(self, bool b=True) -> AuiPaneInfo"""
         return _aui.AuiPaneInfo_Movable(*args, **kwargs)
 
         """Movable(self, bool b=True) -> AuiPaneInfo"""
         return _aui.AuiPaneInfo_Movable(*args, **kwargs)
 

-    def SaveHidden(*args, **kwargs):
-        """SaveHidden(self) -> AuiPaneInfo"""
-        return _aui.AuiPaneInfo_SaveHidden(*args, **kwargs)
-
-    def RestoreHidden(*args, **kwargs):
-        """RestoreHidden(self) -> AuiPaneInfo"""
-        return _aui.AuiPaneInfo_RestoreHidden(*args, **kwargs)
-

     def Dockable(*args, **kwargs):
         """Dockable(self, bool b=True) -> AuiPaneInfo"""
         return _aui.AuiPaneInfo_Dockable(*args, **kwargs)
     def Dockable(*args, **kwargs):
         """Dockable(self, bool b=True) -> AuiPaneInfo"""
         return _aui.AuiPaneInfo_Dockable(*args, **kwargs)


@@ -535,7 +527,6 @@ class AuiPaneInfo(object):
     optionActive = _aui.AuiPaneInfo_optionActive
     optionGripperTop = _aui.AuiPaneInfo_optionGripperTop
     optionMaximized = _aui.AuiPaneInfo_optionMaximized
     optionActive = _aui.AuiPaneInfo_optionActive
     optionGripperTop = _aui.AuiPaneInfo_optionGripperTop
     optionMaximized = _aui.AuiPaneInfo_optionMaximized

-    optionSavedHidden = _aui.AuiPaneInfo_optionSavedHidden

     buttonClose = _aui.AuiPaneInfo_buttonClose
     buttonMaximize = _aui.AuiPaneInfo_buttonMaximize
     buttonMinimize = _aui.AuiPaneInfo_buttonMinimize
     buttonClose = _aui.AuiPaneInfo_buttonClose
     buttonMaximize = _aui.AuiPaneInfo_buttonMaximize
     buttonMinimize = _aui.AuiPaneInfo_buttonMinimize


@@ -543,6 +534,7 @@ class AuiPaneInfo(object):
     buttonCustom1 = _aui.AuiPaneInfo_buttonCustom1
     buttonCustom2 = _aui.AuiPaneInfo_buttonCustom2
     buttonCustom3 = _aui.AuiPaneInfo_buttonCustom3
     buttonCustom1 = _aui.AuiPaneInfo_buttonCustom1
     buttonCustom2 = _aui.AuiPaneInfo_buttonCustom2
     buttonCustom3 = _aui.AuiPaneInfo_buttonCustom3

+    savedHiddenState = _aui.AuiPaneInfo_savedHiddenState

     actionPane = _aui.AuiPaneInfo_actionPane
     name = property(_aui.AuiPaneInfo_name_get, _aui.AuiPaneInfo_name_set)
     caption = property(_aui.AuiPaneInfo_caption_get, _aui.AuiPaneInfo_caption_set)
     actionPane = _aui.AuiPaneInfo_actionPane
     name = property(_aui.AuiPaneInfo_name_get, _aui.AuiPaneInfo_name_set)
     caption = property(_aui.AuiPaneInfo_caption_get, _aui.AuiPaneInfo_caption_set)


@@ -874,6 +866,7 @@ class AuiDockInfo(object):
     resizable = property(_aui.AuiDockInfo_resizable_get, _aui.AuiDockInfo_resizable_set)
     toolbar = property(_aui.AuiDockInfo_toolbar_get, _aui.AuiDockInfo_toolbar_set)
     fixed = property(_aui.AuiDockInfo_fixed_get, _aui.AuiDockInfo_fixed_set)
     resizable = property(_aui.AuiDockInfo_resizable_get, _aui.AuiDockInfo_resizable_set)
     toolbar = property(_aui.AuiDockInfo_toolbar_get, _aui.AuiDockInfo_toolbar_set)
     fixed = property(_aui.AuiDockInfo_fixed_get, _aui.AuiDockInfo_fixed_set)

+    reserved1 = property(_aui.AuiDockInfo_reserved1_get, _aui.AuiDockInfo_reserved1_set)

     __swig_destroy__ = _aui.delete_AuiDockInfo
     __del__ = lambda self : None;
 _aui.AuiDockInfo_swigregister(AuiDockInfo)
     __swig_destroy__ = _aui.delete_AuiDockInfo
     __del__ = lambda self : None;
 _aui.AuiDockInfo_swigregister(AuiDockInfo)


@@ -1145,25 +1138,19 @@ class AuiTabArt(object):
 
     def DrawTab(*args, **kwargs):
         """
 
     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, 
         """
         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)
 
         """
         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, 
     def GetTabSize(*args, **kwargs):
         """
         GetTabSize(self, DC dc, Window wnd, String caption, Bitmap bitmap, bool active, 


@@ -1171,9 +1158,13 @@ class AuiTabArt(object):
         """
         return _aui.AuiTabArt_GetTabSize(*args, **kwargs)
 
         """
         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"""
 
     def GetBestTabCtrlSize(*args, **kwargs):
         """GetBestTabCtrlSize(self, Window wnd, wxAuiNotebookPageArray pages, Size required_bmp_size) -> int"""


@@ -1279,9 +1270,12 @@ class AuiTabContainer(object):
         """GetPageCount(self) -> size_t"""
         return _aui.AuiTabContainer_GetPageCount(*args, **kwargs)
 
         """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"""
 
     def GetPages(*args, **kwargs):
         """GetPages(self) -> wxAuiNotebookPageArray"""


@@ -1370,6 +1364,22 @@ class AuiNotebook(_core.Control):
         """
         return _aui.AuiNotebook_Create(*args, **kwargs)
 
         """
         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)
     def AddPage(*args, **kwargs):
         """AddPage(self, Window page, String caption, bool select=False, Bitmap bitmap=wxNullBitmap) -> bool"""
         return _aui.AuiNotebook_AddPage(*args, **kwargs)


@@ -1389,14 +1399,34 @@ class AuiNotebook(_core.Control):
         """RemovePage(self, size_t page) -> bool"""
         return _aui.AuiNotebook_RemovePage(*args, **kwargs)
 
         """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 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 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)
     def SetSelection(*args, **kwargs):
         """SetSelection(self, size_t new_page) -> size_t"""
         return _aui.AuiNotebook_SetSelection(*args, **kwargs)


@@ -1405,33 +1435,9 @@ class AuiNotebook(_core.Control):
         """GetSelection(self) -> int"""
         return _aui.AuiNotebook_GetSelection(*args, **kwargs)
 
         """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`") 
 
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`")