Forgot to remove wxBackingFile from the changes.txt. It was kept internal

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

diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py
index 192eea0b69ec46d9c29084db0f384dbf72a0dfe6..28b11774cb2aa549f88af75f1d122071e113dfad 100644 (file)
--- a/wxPython/src/mac/aui.py
+++ b/wxPython/src/mac/aui.py
@@ -201,6 +201,7 @@ AUI_BUTTON_MAXIMIZE_RESTORE = _aui.AUI_BUTTON_MAXIMIZE_RESTORE
 AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE
 AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN
 AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS
+AUI_BUTTON_WINDOWLIST = _aui.AUI_BUTTON_WINDOWLIST
 AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT
 AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT
 AUI_BUTTON_UP = _aui.AUI_BUTTON_UP
@@ -611,12 +612,13 @@ class AuiManager(_core.EvtHandler):
         """GetAllPanes(self) -> wxAuiPaneInfoArray"""
         return _aui.AuiManager_GetAllPanes(*args, **kwargs)
 
-    def AddPane(*args):
-        """
-        AddPane(self, Window window, AuiPaneInfo pane_info) -> bool
-        AddPane(self, Window window, AuiPaneInfo pane_info, Point drop_pos) -> bool
-        """
-        return _aui.AuiManager_AddPane(*args)
+    def _AddPane1(*args, **kwargs):
+        """_AddPane1(self, Window window, AuiPaneInfo pane_info) -> bool"""
+        return _aui.AuiManager__AddPane1(*args, **kwargs)
+
+    def AddPane(*args, **kwargs):
+        """AddPane(self, Window window, AuiPaneInfo pane_info, Point drop_pos) -> bool"""
+        return _aui.AuiManager_AddPane(*args, **kwargs)
 
     def _AddPane2(*args, **kwargs):
         """_AddPane2(self, Window window, int direction=LEFT, String caption=wxEmptyString) -> bool"""
@@ -726,7 +728,7 @@ class AuiManager(_core.EvtHandler):
         pane info, and defaults to ``wx.LEFT``.  The pane caption may
         also be specified as an extra parameter in this form.
         """
-        if type(info) == PaneInfo:
+        if type(info) == AuiPaneInfo:
             return self._AddPane1(window, info)
         else:
             
@@ -989,9 +991,10 @@ AUI_NB_RIGHT = _aui.AUI_NB_RIGHT
 AUI_NB_BOTTOM = _aui.AUI_NB_BOTTOM
 AUI_NB_TAB_SPLIT = _aui.AUI_NB_TAB_SPLIT
 AUI_NB_TAB_MOVE = _aui.AUI_NB_TAB_MOVE
+AUI_NB_TAB_EXTERNAL_MOVE = _aui.AUI_NB_TAB_EXTERNAL_MOVE
 AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS
+AUI_NB_WINDOWLIST_BUTTON = _aui.AUI_NB_WINDOWLIST_BUTTON
 AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON
-AUI_NB_PAGELIST_BUTTON = _aui.AUI_NB_PAGELIST_BUTTON
 AUI_NB_CLOSE_ON_ACTIVE_TAB = _aui.AUI_NB_CLOSE_ON_ACTIVE_TAB
 AUI_NB_CLOSE_ON_ALL_TABS = _aui.AUI_NB_CLOSE_ON_ALL_TABS
 AUI_NB_DEFAULT_STYLE = _aui.AUI_NB_DEFAULT_STYLE
@@ -1015,30 +1018,36 @@ class AuiTabArt(object):
         return _aui.AuiTabArt_SetMeasuringFont(*args, **kwargs)
 
     def DrawBackground(*args, **kwargs):
-        """DrawBackground(self, DC dc, Rect rect)"""
+        """DrawBackground(self, DC dc, Window wnd, Rect rect)"""
         return _aui.AuiTabArt_DrawBackground(*args, **kwargs)
 
     def DrawTab(*args, **kwargs):
         """
-        DrawTab(self, DC dc, Rect in_rect, String caption, bool active, bool with_close_button, 
-            Rect out_rect, int x_extent)
+        DrawTab(self, DC dc, Window wnd, Rect in_rect, String caption, bool active, 
+            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, Rect in_rect, int bitmap_id, int button_state, 
-            int orientation, Bitmap bitmap_override, Rect out_rect)
+        DrawButton(self, DC dc, Window wnd, Rect in_rect, int bitmap_id, int button_state, 
+            int orientation, Bitmap bitmap_override, 
+            Rect out_rect)
         """
         return _aui.AuiTabArt_DrawButton(*args, **kwargs)
 
     def GetTabSize(*args, **kwargs):
         """
-        GetTabSize(self, DC dc, String caption, bool active, bool with_close_button, 
+        GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, 
             int x_extent) -> Size
         """
         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 GetBestTabCtrlSize(*args, **kwargs):
         """GetBestTabCtrlSize(self, Window wnd) -> int"""
         return _aui.AuiTabArt_GetBestTabCtrlSize(*args, **kwargs)
@@ -1067,10 +1076,6 @@ class AuiNotebookEvent(_core.NotifyEvent):
         """SetSelection(self, int s)"""
         return _aui.AuiNotebookEvent_SetSelection(*args, **kwargs)
 
-    def SetOldSelection(*args, **kwargs):
-        """SetOldSelection(self, int s)"""
-        return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs)
-
     def GetSelection(*args, **kwargs):
         """
         GetSelection(self) -> int
@@ -1080,12 +1085,25 @@ class AuiNotebookEvent(_core.NotifyEvent):
         """
         return _aui.AuiNotebookEvent_GetSelection(*args, **kwargs)
 
+    def SetOldSelection(*args, **kwargs):
+        """SetOldSelection(self, int s)"""
+        return _aui.AuiNotebookEvent_SetOldSelection(*args, **kwargs)
+
     def GetOldSelection(*args, **kwargs):
         """GetOldSelection(self) -> int"""
         return _aui.AuiNotebookEvent_GetOldSelection(*args, **kwargs)
 
+    def SetDragSource(*args, **kwargs):
+        """SetDragSource(self, AuiNotebook s)"""
+        return _aui.AuiNotebookEvent_SetDragSource(*args, **kwargs)
+
+    def GetDragSource(*args, **kwargs):
+        """GetDragSource(self) -> AuiNotebook"""
+        return _aui.AuiNotebookEvent_GetDragSource(*args, **kwargs)
+
     old_selection = property(_aui.AuiNotebookEvent_old_selection_get, _aui.AuiNotebookEvent_old_selection_set)
     selection = property(_aui.AuiNotebookEvent_selection_get, _aui.AuiNotebookEvent_selection_set)
+    drag_source = property(_aui.AuiNotebookEvent_drag_source_get, _aui.AuiNotebookEvent_drag_source_set)
     OldSelection = property(GetOldSelection,SetOldSelection,doc="See `GetOldSelection` and `SetOldSelection`") 
     Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
 _aui.AuiNotebookEvent_swigregister(AuiNotebookEvent)
@@ -1219,6 +1237,10 @@ class AuiTabContainer(object):
         """SetRect(self, Rect rect)"""
         return _aui.AuiTabContainer_SetRect(*args, **kwargs)
 
+    def RemoveButton(*args, **kwargs):
+        """RemoveButton(self, int id)"""
+        return _aui.AuiTabContainer_RemoveButton(*args, **kwargs)
+
     def AddButton(*args, **kwargs):
         """
         AddButton(self, int id, int location, Bitmap normal_bitmap=wxNullBitmap, 
@@ -1335,18 +1357,22 @@ def PreAuiNotebook(*args, **kwargs):
     self._setOORInfo(self)
     return val
 
+wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE
 wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING = _aui.wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING
 wxEVT_COMMAND_AUINOTEBOOK_BUTTON = _aui.wxEVT_COMMAND_AUINOTEBOOK_BUTTON
 wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG
 wxEVT_COMMAND_AUINOTEBOOK_END_DRAG = _aui.wxEVT_COMMAND_AUINOTEBOOK_END_DRAG
 wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION = _aui.wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION
+wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND = _aui.wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND
+EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 1 )
 EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 1 )
 EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 1 )
 EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 1 )
 EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 1 )
 EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 1 )
 EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 1 )
+EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 1 )
 
 class PyAuiDockArt(AuiDefaultDockArt):
     """