move default button handling code from wxControlContainer to wxTLW (patch 1524441)

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

diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py
index cac179bde2e72a4683ff9e4db5fafb2fcff2842b..aa3523992b19c6356ca45c5d2824c51940a01d37 100644 (file)
--- a/wxPython/src/msw/aui.py
+++ b/wxPython/src/msw/aui.py
@@ -171,23 +171,23 @@ AUI_MGR_RECTANGLE_HINT = _aui.AUI_MGR_RECTANGLE_HINT
 AUI_MGR_HINT_FADE = _aui.AUI_MGR_HINT_FADE
 AUI_MGR_NO_VENETIAN_BLINDS_FADE = _aui.AUI_MGR_NO_VENETIAN_BLINDS_FADE
 AUI_MGR_DEFAULT = _aui.AUI_MGR_DEFAULT
 AUI_MGR_HINT_FADE = _aui.AUI_MGR_HINT_FADE
 AUI_MGR_NO_VENETIAN_BLINDS_FADE = _aui.AUI_MGR_NO_VENETIAN_BLINDS_FADE
 AUI_MGR_DEFAULT = _aui.AUI_MGR_DEFAULT

-AUI_ART_SASH_SIZE = _aui.AUI_ART_SASH_SIZE
-AUI_ART_CAPTION_SIZE = _aui.AUI_ART_CAPTION_SIZE
-AUI_ART_GRIPPER_SIZE = _aui.AUI_ART_GRIPPER_SIZE
-AUI_ART_PANE_BORDER_SIZE = _aui.AUI_ART_PANE_BORDER_SIZE
-AUI_ART_PANE_BUTTON_SIZE = _aui.AUI_ART_PANE_BUTTON_SIZE
-AUI_ART_BACKGROUND_COLOUR = _aui.AUI_ART_BACKGROUND_COLOUR
-AUI_ART_SASH_COLOUR = _aui.AUI_ART_SASH_COLOUR
-AUI_ART_ACTIVE_CAPTION_COLOUR = _aui.AUI_ART_ACTIVE_CAPTION_COLOUR
-AUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR = _aui.AUI_ART_ACTIVE_CAPTION_GRADIENT_COLOUR
-AUI_ART_INACTIVE_CAPTION_COLOUR = _aui.AUI_ART_INACTIVE_CAPTION_COLOUR
-AUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR = _aui.AUI_ART_INACTIVE_CAPTION_GRADIENT_COLOUR
-AUI_ART_ACTIVE_CAPTION_TEXT_COLOUR = _aui.AUI_ART_ACTIVE_CAPTION_TEXT_COLOUR
-AUI_ART_INACTIVE_CAPTION_TEXT_COLOUR = _aui.AUI_ART_INACTIVE_CAPTION_TEXT_COLOUR
-AUI_ART_BORDER_COLOUR = _aui.AUI_ART_BORDER_COLOUR
-AUI_ART_GRIPPER_COLOUR = _aui.AUI_ART_GRIPPER_COLOUR
-AUI_ART_CAPTION_FONT = _aui.AUI_ART_CAPTION_FONT
-AUI_ART_GRADIENT_TYPE = _aui.AUI_ART_GRADIENT_TYPE
+AUI_DOCKART_SASH_SIZE = _aui.AUI_DOCKART_SASH_SIZE
+AUI_DOCKART_CAPTION_SIZE = _aui.AUI_DOCKART_CAPTION_SIZE
+AUI_DOCKART_GRIPPER_SIZE = _aui.AUI_DOCKART_GRIPPER_SIZE
+AUI_DOCKART_PANE_BORDER_SIZE = _aui.AUI_DOCKART_PANE_BORDER_SIZE
+AUI_DOCKART_PANE_BUTTON_SIZE = _aui.AUI_DOCKART_PANE_BUTTON_SIZE
+AUI_DOCKART_BACKGROUND_COLOUR = _aui.AUI_DOCKART_BACKGROUND_COLOUR
+AUI_DOCKART_SASH_COLOUR = _aui.AUI_DOCKART_SASH_COLOUR
+AUI_DOCKART_ACTIVE_CAPTION_COLOUR = _aui.AUI_DOCKART_ACTIVE_CAPTION_COLOUR
+AUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR = _aui.AUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR
+AUI_DOCKART_INACTIVE_CAPTION_COLOUR = _aui.AUI_DOCKART_INACTIVE_CAPTION_COLOUR
+AUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR = _aui.AUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR
+AUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR = _aui.AUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR
+AUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR = _aui.AUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR
+AUI_DOCKART_BORDER_COLOUR = _aui.AUI_DOCKART_BORDER_COLOUR
+AUI_DOCKART_GRIPPER_COLOUR = _aui.AUI_DOCKART_GRIPPER_COLOUR
+AUI_DOCKART_CAPTION_FONT = _aui.AUI_DOCKART_CAPTION_FONT
+AUI_DOCKART_GRADIENT_TYPE = _aui.AUI_DOCKART_GRADIENT_TYPE

 AUI_GRADIENT_NONE = _aui.AUI_GRADIENT_NONE
 AUI_GRADIENT_VERTICAL = _aui.AUI_GRADIENT_VERTICAL
 AUI_GRADIENT_HORIZONTAL = _aui.AUI_GRADIENT_HORIZONTAL
 AUI_GRADIENT_NONE = _aui.AUI_GRADIENT_NONE
 AUI_GRADIENT_VERTICAL = _aui.AUI_GRADIENT_VERTICAL
 AUI_GRADIENT_HORIZONTAL = _aui.AUI_GRADIENT_HORIZONTAL


@@ -196,6 +196,7 @@ AUI_BUTTON_STATE_HOVER = _aui.AUI_BUTTON_STATE_HOVER
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED
 AUI_BUTTON_STATE_DISABLED = _aui.AUI_BUTTON_STATE_DISABLED
 AUI_BUTTON_STATE_HIDDEN = _aui.AUI_BUTTON_STATE_HIDDEN
 AUI_BUTTON_STATE_PRESSED = _aui.AUI_BUTTON_STATE_PRESSED
 AUI_BUTTON_STATE_DISABLED = _aui.AUI_BUTTON_STATE_DISABLED
 AUI_BUTTON_STATE_HIDDEN = _aui.AUI_BUTTON_STATE_HIDDEN

+AUI_BUTTON_STATE_CHECKED = _aui.AUI_BUTTON_STATE_CHECKED

 AUI_BUTTON_CLOSE = _aui.AUI_BUTTON_CLOSE
 AUI_BUTTON_MAXIMIZE_RESTORE = _aui.AUI_BUTTON_MAXIMIZE_RESTORE
 AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE
 AUI_BUTTON_CLOSE = _aui.AUI_BUTTON_CLOSE
 AUI_BUTTON_MAXIMIZE_RESTORE = _aui.AUI_BUTTON_MAXIMIZE_RESTORE
 AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE


@@ -592,6 +593,11 @@ class AuiManager(_core.EvtHandler):
         """GetManagedWindow(self) -> Window"""
         return _aui.AuiManager_GetManagedWindow(*args, **kwargs)
 
         """GetManagedWindow(self) -> Window"""
         return _aui.AuiManager_GetManagedWindow(*args, **kwargs)
 

+    def GetManager(*args, **kwargs):
+        """GetManager(Window window) -> AuiManager"""
+        return _aui.AuiManager_GetManager(*args, **kwargs)
+
+    GetManager = staticmethod(GetManager)

     def SetArtProvider(*args, **kwargs):
         """SetArtProvider(self, AuiDockArt art_provider)"""
         return _aui.AuiManager_SetArtProvider(*args, **kwargs)
     def SetArtProvider(*args, **kwargs):
         """SetArtProvider(self, AuiDockArt art_provider)"""
         return _aui.AuiManager_SetArtProvider(*args, **kwargs)


@@ -632,21 +638,9 @@ class AuiManager(_core.EvtHandler):
         """DetachPane(self, Window window) -> bool"""
         return _aui.AuiManager_DetachPane(*args, **kwargs)
 
         """DetachPane(self, Window window) -> bool"""
         return _aui.AuiManager_DetachPane(*args, **kwargs)
 

-    def ClosePane(*args, **kwargs):
-        """ClosePane(self, AuiPaneInfo pane_info)"""
-        return _aui.AuiManager_ClosePane(*args, **kwargs)
-
-    def MaximizePane(*args, **kwargs):
-        """MaximizePane(self, AuiPaneInfo pane_info)"""
-        return _aui.AuiManager_MaximizePane(*args, **kwargs)
-
-    def RestorePane(*args, **kwargs):
-        """RestorePane(self, AuiPaneInfo pane_info)"""
-        return _aui.AuiManager_RestorePane(*args, **kwargs)
-
-    def RestoreMaximizedPane(*args, **kwargs):
-        """RestoreMaximizedPane(self)"""
-        return _aui.AuiManager_RestoreMaximizedPane(*args, **kwargs)
+    def Update(*args, **kwargs):
+        """Update(self)"""
+        return _aui.AuiManager_Update(*args, **kwargs)

 
     def SavePaneInfo(*args, **kwargs):
         """SavePaneInfo(self, AuiPaneInfo pane) -> String"""
 
     def SavePaneInfo(*args, **kwargs):
         """SavePaneInfo(self, AuiPaneInfo pane) -> String"""


@@ -664,14 +658,42 @@ class AuiManager(_core.EvtHandler):
         """LoadPerspective(self, String perspective, bool update=True) -> bool"""
         return _aui.AuiManager_LoadPerspective(*args, **kwargs)
 
         """LoadPerspective(self, String perspective, bool update=True) -> bool"""
         return _aui.AuiManager_LoadPerspective(*args, **kwargs)
 

-    def Update(*args, **kwargs):
-        """Update(self)"""
-        return _aui.AuiManager_Update(*args, **kwargs)
+    def SetDockSizeConstraint(*args, **kwargs):
+        """SetDockSizeConstraint(self, double width_pct, double height_pct)"""
+        return _aui.AuiManager_SetDockSizeConstraint(*args, **kwargs)
+
+    def GetDockSizeConstraint(*args, **kwargs):
+        """GetDockSizeConstraint(self, double width_pct, double height_pct)"""
+        return _aui.AuiManager_GetDockSizeConstraint(*args, **kwargs)
+
+    def ClosePane(*args, **kwargs):
+        """ClosePane(self, AuiPaneInfo pane_info)"""
+        return _aui.AuiManager_ClosePane(*args, **kwargs)
+
+    def MaximizePane(*args, **kwargs):
+        """MaximizePane(self, AuiPaneInfo pane_info)"""
+        return _aui.AuiManager_MaximizePane(*args, **kwargs)
+
+    def RestorePane(*args, **kwargs):
+        """RestorePane(self, AuiPaneInfo pane_info)"""
+        return _aui.AuiManager_RestorePane(*args, **kwargs)
+
+    def RestoreMaximizedPane(*args, **kwargs):
+        """RestoreMaximizedPane(self)"""
+        return _aui.AuiManager_RestoreMaximizedPane(*args, **kwargs)

 
     def CreateFloatingFrame(*args, **kwargs):
         """CreateFloatingFrame(self, Window parent, AuiPaneInfo p) -> AuiFloatingFrame"""
         return _aui.AuiManager_CreateFloatingFrame(*args, **kwargs)
 
 
     def CreateFloatingFrame(*args, **kwargs):
         """CreateFloatingFrame(self, Window parent, AuiPaneInfo p) -> AuiFloatingFrame"""
         return _aui.AuiManager_CreateFloatingFrame(*args, **kwargs)
 

+    def StartPaneDrag(*args, **kwargs):
+        """StartPaneDrag(self, Window pane_window, Point offset)"""
+        return _aui.AuiManager_StartPaneDrag(*args, **kwargs)
+
+    def CalculateHintRect(*args, **kwargs):
+        """CalculateHintRect(self, Window pane_window, Point pt, Point offset) -> Rect"""
+        return _aui.AuiManager_CalculateHintRect(*args, **kwargs)
+

     def DrawHintRect(*args, **kwargs):
         """DrawHintRect(self, Window pane_window, Point pt, Point offset)"""
         return _aui.AuiManager_DrawHintRect(*args, **kwargs)
     def DrawHintRect(*args, **kwargs):
         """DrawHintRect(self, Window pane_window, Point pt, Point offset)"""
         return _aui.AuiManager_DrawHintRect(*args, **kwargs)


@@ -749,6 +771,10 @@ class AuiManager(_core.EvtHandler):
     ManagedWindow = property(GetManagedWindow,SetManagedWindow,doc="See `GetManagedWindow` and `SetManagedWindow`") 
 _aui.AuiManager_swigregister(AuiManager)
 
     ManagedWindow = property(GetManagedWindow,SetManagedWindow,doc="See `GetManagedWindow` and `SetManagedWindow`") 
 _aui.AuiManager_swigregister(AuiManager)
 

+def AuiManager_GetManager(*args, **kwargs):
+  """AuiManager_GetManager(Window window) -> AuiManager"""
+  return _aui.AuiManager_GetManager(*args, **kwargs)
+

 class AuiManagerEvent(_core.Event):
     """Proxy of C++ AuiManagerEvent class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class AuiManagerEvent(_core.Event):
     """Proxy of C++ AuiManagerEvent class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -760,6 +786,10 @@ class AuiManagerEvent(_core.Event):
         """Clone(self) -> Event"""
         return _aui.AuiManagerEvent_Clone(*args, **kwargs)
 
         """Clone(self) -> Event"""
         return _aui.AuiManagerEvent_Clone(*args, **kwargs)
 

+    def SetManager(*args, **kwargs):
+        """SetManager(self, AuiManager mgr)"""
+        return _aui.AuiManagerEvent_SetManager(*args, **kwargs)
+

     def SetPane(*args, **kwargs):
         """SetPane(self, AuiPaneInfo p)"""
         return _aui.AuiManagerEvent_SetPane(*args, **kwargs)
     def SetPane(*args, **kwargs):
         """SetPane(self, AuiPaneInfo p)"""
         return _aui.AuiManagerEvent_SetPane(*args, **kwargs)


@@ -772,6 +802,10 @@ class AuiManagerEvent(_core.Event):
         """SetDC(self, DC pdc)"""
         return _aui.AuiManagerEvent_SetDC(*args, **kwargs)
 
         """SetDC(self, DC pdc)"""
         return _aui.AuiManagerEvent_SetDC(*args, **kwargs)
 

+    def GetManager(*args, **kwargs):
+        """GetManager(self) -> AuiManager"""
+        return _aui.AuiManagerEvent_GetManager(*args, **kwargs)
+

     def GetPane(*args, **kwargs):
         """GetPane(self) -> AuiPaneInfo"""
         return _aui.AuiManagerEvent_GetPane(*args, **kwargs)
     def GetPane(*args, **kwargs):
         """GetPane(self) -> AuiPaneInfo"""
         return _aui.AuiManagerEvent_GetPane(*args, **kwargs)


@@ -800,6 +834,7 @@ class AuiManagerEvent(_core.Event):
         """CanVeto(self) -> bool"""
         return _aui.AuiManagerEvent_CanVeto(*args, **kwargs)
 
         """CanVeto(self) -> bool"""
         return _aui.AuiManagerEvent_CanVeto(*args, **kwargs)
 

+    manager = property(_aui.AuiManagerEvent_manager_get, _aui.AuiManagerEvent_manager_set)

     pane = property(_aui.AuiManagerEvent_pane_get, _aui.AuiManagerEvent_pane_set)
     button = property(_aui.AuiManagerEvent_button_get, _aui.AuiManagerEvent_button_set)
     veto_flag = property(_aui.AuiManagerEvent_veto_flag_get, _aui.AuiManagerEvent_veto_flag_set)
     pane = property(_aui.AuiManagerEvent_pane_get, _aui.AuiManagerEvent_pane_set)
     button = property(_aui.AuiManagerEvent_button_get, _aui.AuiManagerEvent_button_set)
     veto_flag = property(_aui.AuiManagerEvent_veto_flag_get, _aui.AuiManagerEvent_veto_flag_set)


@@ -879,16 +914,18 @@ class AuiPaneButton(object):
     __del__ = lambda self : None;
 _aui.AuiPaneButton_swigregister(AuiPaneButton)
 
     __del__ = lambda self : None;
 _aui.AuiPaneButton_swigregister(AuiPaneButton)
 

-wxEVT_AUI_PANEBUTTON = _aui.wxEVT_AUI_PANEBUTTON
-wxEVT_AUI_PANECLOSE = _aui.wxEVT_AUI_PANECLOSE
-wxEVT_AUI_PANEMAXIMIZE = _aui.wxEVT_AUI_PANEMAXIMIZE
-wxEVT_AUI_PANERESTORE = _aui.wxEVT_AUI_PANERESTORE
+wxEVT_AUI_PANE_BUTTON = _aui.wxEVT_AUI_PANE_BUTTON
+wxEVT_AUI_PANE_CLOSE = _aui.wxEVT_AUI_PANE_CLOSE
+wxEVT_AUI_PANE_MAXIMIZE = _aui.wxEVT_AUI_PANE_MAXIMIZE
+wxEVT_AUI_PANE_RESTORE = _aui.wxEVT_AUI_PANE_RESTORE

 wxEVT_AUI_RENDER = _aui.wxEVT_AUI_RENDER
 wxEVT_AUI_RENDER = _aui.wxEVT_AUI_RENDER

-EVT_AUI_PANEBUTTON = wx.PyEventBinder( wxEVT_AUI_PANEBUTTON )
-EVT_AUI_PANECLOSE = wx.PyEventBinder( wxEVT_AUI_PANECLOSE )
-EVT_AUI_PANECLOSE = wx.PyEventBinder( wxEVT_AUI_PANEMAXIMIZE )
-EVT_AUI_PANECLOSE = wx.PyEventBinder( wxEVT_AUI_PANERESTORE )
+wxEVT_AUI_FIND_MANAGER = _aui.wxEVT_AUI_FIND_MANAGER
+EVT_AUI_PANE_BUTTON = wx.PyEventBinder( wxEVT_AUI_PANE_BUTTON )
+EVT_AUI_PANE_CLOSE = wx.PyEventBinder( wxEVT_AUI_PANE_CLOSE )
+EVT_AUI_PANE_MAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANE_MAXIMIZE )
+EVT_AUI_PANE_RESTORE = wx.PyEventBinder( wxEVT_AUI_PANE_RESTORE )

 EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER )
 EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER )

+EVT_AUI_FIND_MANAGER = wx.PyEventBinder( wxEVT_AUI_FIND_MANAGER )

 
 class AuiDockArt(object):
     """Proxy of C++ AuiDockArt class"""
 
 class AuiDockArt(object):
     """Proxy of C++ AuiDockArt class"""


@@ -983,6 +1020,10 @@ class AuiFloatingFrame(_windows.MiniFrame):
         """SetPaneWindow(self, AuiPaneInfo pane)"""
         return _aui.AuiFloatingFrame_SetPaneWindow(*args, **kwargs)
 
         """SetPaneWindow(self, AuiPaneInfo pane)"""
         return _aui.AuiFloatingFrame_SetPaneWindow(*args, **kwargs)
 

+    def GetOwnerManager(*args, **kwargs):
+        """GetOwnerManager(self) -> AuiManager"""
+        return _aui.AuiFloatingFrame_GetOwnerManager(*args, **kwargs)
+

 _aui.AuiFloatingFrame_swigregister(AuiFloatingFrame)
 
 AUI_NB_TOP = _aui.AUI_NB_TOP
 _aui.AuiFloatingFrame_swigregister(AuiFloatingFrame)
 
 AUI_NB_TOP = _aui.AUI_NB_TOP


@@ -991,12 +1032,82 @@ 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_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_TAB_FIXED_WIDTH = _aui.AUI_NB_TAB_FIXED_WIDTH

 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_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
 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_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

+class AuiNotebookEvent(_core.NotifyEvent):
+    """Proxy of C++ AuiNotebookEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, EventType command_type=wxEVT_NULL, int win_id=0) -> AuiNotebookEvent"""
+        _aui.AuiNotebookEvent_swiginit(self,_aui.new_AuiNotebookEvent(*args, **kwargs))
+    def SetSelection(*args, **kwargs):
+        """SetSelection(self, int s)"""
+        return _aui.AuiNotebookEvent_SetSelection(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """
+        GetSelection(self) -> int
+
+        Returns item index for a listbox or choice selection event (not valid
+        for a deselection).
+        """
+        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)
+
+class AuiNotebookPage(object):
+    """Proxy of C++ AuiNotebookPage class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    window = property(_aui.AuiNotebookPage_window_get, _aui.AuiNotebookPage_window_set)
+    caption = property(_aui.AuiNotebookPage_caption_get, _aui.AuiNotebookPage_caption_set)
+    bitmap = property(_aui.AuiNotebookPage_bitmap_get, _aui.AuiNotebookPage_bitmap_set)
+    rect = property(_aui.AuiNotebookPage_rect_get, _aui.AuiNotebookPage_rect_set)
+    active = property(_aui.AuiNotebookPage_active_get, _aui.AuiNotebookPage_active_set)
+_aui.AuiNotebookPage_swigregister(AuiNotebookPage)
+
+class AuiTabContainerButton(object):
+    """Proxy of C++ AuiTabContainerButton class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    id = property(_aui.AuiTabContainerButton_id_get, _aui.AuiTabContainerButton_id_set)
+    cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
+    location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
+    bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)
+    dis_bitmap = property(_aui.AuiTabContainerButton_dis_bitmap_get, _aui.AuiTabContainerButton_dis_bitmap_set)
+    rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
+_aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
+

 class AuiTabArt(object):
     """Proxy of C++ AuiTabArt class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class AuiTabArt(object):
     """Proxy of C++ AuiTabArt class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -1004,6 +1115,18 @@ class AuiTabArt(object):
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_AuiTabArt
     __del__ = lambda self : None;
     __repr__ = _swig_repr
     __swig_destroy__ = _aui.delete_AuiTabArt
     __del__ = lambda self : None;

+    def Clone(*args, **kwargs):
+        """Clone(self) -> AuiTabArt"""
+        return _aui.AuiTabArt_Clone(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(self, int flags)"""
+        return _aui.AuiTabArt_SetFlags(*args, **kwargs)
+
+    def SetSizingInfo(*args, **kwargs):
+        """SetSizingInfo(self, Size tab_ctrl_size, size_t tab_count)"""
+        return _aui.AuiTabArt_SetSizingInfo(*args, **kwargs)
+

     def SetNormalFont(*args, **kwargs):
         """SetNormalFont(self, Font font)"""
         return _aui.AuiTabArt_SetNormalFont(*args, **kwargs)
     def SetNormalFont(*args, **kwargs):
         """SetNormalFont(self, Font font)"""
         return _aui.AuiTabArt_SetNormalFont(*args, **kwargs)


@@ -1022,9 +1145,10 @@ class AuiTabArt(object):
 
     def DrawTab(*args, **kwargs):
         """
 
     def DrawTab(*args, **kwargs):
         """

-        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)
+        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)

         """
         return _aui.AuiTabArt_DrawTab(*args, **kwargs)
 
         """
         return _aui.AuiTabArt_DrawTab(*args, **kwargs)
 


@@ -1036,19 +1160,23 @@ class AuiTabArt(object):
         """
         return _aui.AuiTabArt_DrawButton(*args, **kwargs)
 
         """
         return _aui.AuiTabArt_DrawButton(*args, **kwargs)
 

-    def ShowWindowList(*args, **kwargs):
-        """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int"""
-        return _aui.AuiTabArt_ShowWindowList(*args, **kwargs)
+    def GetIndentSize(*args, **kwargs):
+        """GetIndentSize(self) -> int"""
+        return _aui.AuiTabArt_GetIndentSize(*args, **kwargs)

 
     def GetTabSize(*args, **kwargs):
         """
 
     def GetTabSize(*args, **kwargs):
         """

-        GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, 
-            int x_extent) -> Size
+        GetTabSize(self, DC dc, Window wnd, String caption, Bitmap bitmap, bool active, 
+            int close_button_state, int x_extent) -> Size

         """
         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 GetBestTabCtrlSize(*args, **kwargs):
     def GetBestTabCtrlSize(*args, **kwargs):

-        """GetBestTabCtrlSize(self, Window wnd) -> int"""
+        """GetBestTabCtrlSize(self, Window wnd, wxAuiNotebookPageArray pages, Size required_bmp_size) -> int"""

         return _aui.AuiTabArt_GetBestTabCtrlSize(*args, **kwargs)
 
 _aui.AuiTabArt_swigregister(AuiTabArt)
         return _aui.AuiTabArt_GetBestTabCtrlSize(*args, **kwargs)
 
 _aui.AuiTabArt_swigregister(AuiTabArt)


@@ -1064,64 +1192,16 @@ class AuiDefaultTabArt(AuiTabArt):
     __del__ = lambda self : None;
 _aui.AuiDefaultTabArt_swigregister(AuiDefaultTabArt)
 
     __del__ = lambda self : None;
 _aui.AuiDefaultTabArt_swigregister(AuiDefaultTabArt)
 

-class AuiNotebookEvent(_core.NotifyEvent):
-    """Proxy of C++ AuiNotebookEvent class"""
+class AuiSimpleTabArt(AuiTabArt):
+    """Proxy of C++ AuiSimpleTabArt class"""

     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 

-        """__init__(self, EventType command_type=wxEVT_NULL, int win_id=0) -> AuiNotebookEvent"""
-        _aui.AuiNotebookEvent_swiginit(self,_aui.new_AuiNotebookEvent(*args, **kwargs))
-    def SetSelection(*args, **kwargs):
-        """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
-
-        Returns item index for a listbox or choice selection event (not valid
-        for a deselection).
-        """
-        return _aui.AuiNotebookEvent_GetSelection(*args, **kwargs)
-
-    def GetOldSelection(*args, **kwargs):
-        """GetOldSelection(self) -> int"""
-        return _aui.AuiNotebookEvent_GetOldSelection(*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)
-    OldSelection = property(GetOldSelection,SetOldSelection,doc="See `GetOldSelection` and `SetOldSelection`") 
-    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
-_aui.AuiNotebookEvent_swigregister(AuiNotebookEvent)
-
-class AuiNotebookPage(object):
-    """Proxy of C++ AuiNotebookPage class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    window = property(_aui.AuiNotebookPage_window_get, _aui.AuiNotebookPage_window_set)
-    caption = property(_aui.AuiNotebookPage_caption_get, _aui.AuiNotebookPage_caption_set)
-    bitmap = property(_aui.AuiNotebookPage_bitmap_get, _aui.AuiNotebookPage_bitmap_set)
-    rect = property(_aui.AuiNotebookPage_rect_get, _aui.AuiNotebookPage_rect_set)
-    active = property(_aui.AuiNotebookPage_active_get, _aui.AuiNotebookPage_active_set)
-_aui.AuiNotebookPage_swigregister(AuiNotebookPage)
-
-class AuiTabContainerButton(object):
-    """Proxy of C++ AuiTabContainerButton class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    id = property(_aui.AuiTabContainerButton_id_get, _aui.AuiTabContainerButton_id_set)
-    cur_state = property(_aui.AuiTabContainerButton_cur_state_get, _aui.AuiTabContainerButton_cur_state_set)
-    location = property(_aui.AuiTabContainerButton_location_get, _aui.AuiTabContainerButton_location_set)
-    bitmap = property(_aui.AuiTabContainerButton_bitmap_get, _aui.AuiTabContainerButton_bitmap_set)
-    dis_bitmap = property(_aui.AuiTabContainerButton_dis_bitmap_get, _aui.AuiTabContainerButton_dis_bitmap_set)
-    rect = property(_aui.AuiTabContainerButton_rect_get, _aui.AuiTabContainerButton_rect_set)
-_aui.AuiTabContainerButton_swigregister(AuiTabContainerButton)
+        """__init__(self) -> AuiSimpleTabArt"""
+        _aui.AuiSimpleTabArt_swiginit(self,_aui.new_AuiSimpleTabArt(*args, **kwargs))
+    __swig_destroy__ = _aui.delete_AuiSimpleTabArt
+    __del__ = lambda self : None;
+_aui.AuiSimpleTabArt_swigregister(AuiSimpleTabArt)

 
 class AuiTabContainer(object):
     """Proxy of C++ AuiTabContainer class"""
 
 class AuiTabContainer(object):
     """Proxy of C++ AuiTabContainer class"""


@@ -1313,6 +1393,10 @@ class AuiNotebook(_core.Control):
         """SetPageText(self, size_t page, String text) -> bool"""
         return _aui.AuiNotebook_SetPageText(*args, **kwargs)
 
         """SetPageText(self, size_t page, String text) -> bool"""
         return _aui.AuiNotebook_SetPageText(*args, **kwargs)
 

+    def SetPageBitmap(*args, **kwargs):
+        """SetPageBitmap(self, size_t page, Bitmap bitmap) -> bool"""
+        return _aui.AuiNotebook_SetPageBitmap(*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)


@@ -1329,6 +1413,10 @@ class AuiNotebook(_core.Control):
         """GetPage(self, size_t page_idx) -> Window"""
         return _aui.AuiNotebook_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 SetArtProvider(*args, **kwargs):
         """SetArtProvider(self, AuiTabArt art)"""
         return _aui.AuiNotebook_SetArtProvider(*args, **kwargs)


@@ -1337,6 +1425,14 @@ class AuiNotebook(_core.Control):
         """GetArtProvider(self) -> AuiTabArt"""
         return _aui.AuiNotebook_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)
+

     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
 _aui.AuiNotebook_swigregister(AuiNotebook)
     PageCount = property(GetPageCount,doc="See `GetPageCount`") 
     Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
 _aui.AuiNotebook_swigregister(AuiNotebook)


@@ -1347,18 +1443,22 @@ def PreAuiNotebook(*args, **kwargs):
     self._setOORInfo(self)
     return val
 
     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_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_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):
     """
 
 class PyAuiDockArt(AuiDefaultDockArt):
     """