X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bd5559898b8bb4e650b26e815240d90592854c2..e6ab1c5756d6f068ff4fd50ad759afce5bd04bbd:/wxPython/src/mac/_controls.py

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index 747ca9edcf..b0ef6f31cd 100644
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -132,8 +132,7 @@ class Button(_core.Control):
         return _controls_.Button_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Button_swigregister = _controls_.Button_swigregister
-Button_swigregister(Button)
+_controls_.Button_swigregister(Button)
 cvar = _controls_.cvar
 ButtonNameStr = cvar.ButtonNameStr
 
@@ -298,8 +297,7 @@ class BitmapButton(Button):
         """GetMarginY(self) -> int"""
         return _controls_.BitmapButton_GetMarginY(*args, **kwargs)
 
-BitmapButton_swigregister = _controls_.BitmapButton_swigregister
-BitmapButton_swigregister(BitmapButton)
+_controls_.BitmapButton_swigregister(BitmapButton)
 
 def PreBitmapButton(*args, **kwargs):
     """
@@ -436,8 +434,7 @@ class CheckBox(_core.Control):
         return _controls_.CheckBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-CheckBox_swigregister = _controls_.CheckBox_swigregister
-CheckBox_swigregister(CheckBox)
+_controls_.CheckBox_swigregister(CheckBox)
 CheckBoxNameStr = cvar.CheckBoxNameStr
 
 def PreCheckBox(*args, **kwargs):
@@ -528,8 +525,7 @@ class Choice(_core.ControlWithItems):
         return _controls_.Choice_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Choice_swigregister = _controls_.Choice_swigregister
-Choice_swigregister(Choice)
+_controls_.Choice_swigregister(Choice)
 ChoiceNameStr = cvar.ChoiceNameStr
 
 def PreChoice(*args, **kwargs):
@@ -692,6 +688,14 @@ class ComboBox(_core.Control,_core.ItemContainer):
         """
         return _controls_.ComboBox_SetStringSelection(*args, **kwargs)
 
+    def SetString(*args, **kwargs):
+        """
+        SetString(self, int n, String string)
+
+        Set the label for the n'th item (zero based) in the list.
+        """
+        return _controls_.ComboBox_SetString(*args, **kwargs)
+
     def SetEditable(*args, **kwargs):
         """SetEditable(self, bool editable)"""
         return _controls_.ComboBox_SetEditable(*args, **kwargs)
@@ -808,8 +812,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
         return _controls_.ComboBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-ComboBox_swigregister = _controls_.ComboBox_swigregister
-ComboBox_swigregister(ComboBox)
+_controls_.ComboBox_swigregister(ComboBox)
 ComboBoxNameStr = cvar.ComboBoxNameStr
 
 def PreComboBox(*args, **kwargs):
@@ -843,7 +846,7 @@ def ComboBox_GetClassDefaultAttributes(*args, **kwargs):
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH
-GA_PROGRESSBAR = _controls_.GA_PROGRESSBAR
+GA_PROGRESSBAR = 0 # obsolete 
 class Gauge(_core.Control):
     """Proxy of C++ Gauge class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -921,8 +924,7 @@ class Gauge(_core.Control):
         return _controls_.Gauge_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Gauge_swigregister = _controls_.Gauge_swigregister
-Gauge_swigregister(Gauge)
+_controls_.Gauge_swigregister(Gauge)
 GaugeNameStr = cvar.GaugeNameStr
 
 def PreGauge(*args, **kwargs):
@@ -988,8 +990,7 @@ class StaticBox(_core.Control):
         return _controls_.StaticBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-StaticBox_swigregister = _controls_.StaticBox_swigregister
-StaticBox_swigregister(StaticBox)
+_controls_.StaticBox_swigregister(StaticBox)
 StaticBitmapNameStr = cvar.StaticBitmapNameStr
 StaticBoxNameStr = cvar.StaticBoxNameStr
 StaticTextNameStr = cvar.StaticTextNameStr
@@ -1066,8 +1067,7 @@ class StaticLine(_core.Control):
         return _controls_.StaticLine_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-StaticLine_swigregister = _controls_.StaticLine_swigregister
-StaticLine_swigregister(StaticLine)
+_controls_.StaticLine_swigregister(StaticLine)
 
 def PreStaticLine(*args, **kwargs):
     """PreStaticLine() -> StaticLine"""
@@ -1147,8 +1147,7 @@ class StaticText(_core.Control):
         return _controls_.StaticText_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-StaticText_swigregister = _controls_.StaticText_swigregister
-StaticText_swigregister(StaticText)
+_controls_.StaticText_swigregister(StaticText)
 
 def PreStaticText(*args, **kwargs):
     """PreStaticText() -> StaticText"""
@@ -1225,8 +1224,7 @@ class StaticBitmap(_core.Control):
         return _controls_.StaticBitmap_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-StaticBitmap_swigregister = _controls_.StaticBitmap_swigregister
-StaticBitmap_swigregister(StaticBitmap)
+_controls_.StaticBitmap_swigregister(StaticBitmap)
 
 def PreStaticBitmap(*args, **kwargs):
     """PreStaticBitmap() -> StaticBitmap"""
@@ -1285,7 +1283,7 @@ class ListBox(_core.ControlWithItems):
         return _controls_.ListBox_Insert(*args, **kwargs)
 
     def InsertItems(*args, **kwargs):
-        """InsertItems(self, wxArrayString items, int pos)"""
+        """InsertItems(self, wxArrayString items, unsigned int pos)"""
         return _controls_.ListBox_InsertItems(*args, **kwargs)
 
     def Set(*args, **kwargs):
@@ -1383,8 +1381,7 @@ class ListBox(_core.ControlWithItems):
         return _controls_.ListBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-ListBox_swigregister = _controls_.ListBox_swigregister
-ListBox_swigregister(ListBox)
+_controls_.ListBox_swigregister(ListBox)
 ListBoxNameStr = cvar.ListBoxNameStr
 
 def PreListBox(*args, **kwargs):
@@ -1435,15 +1432,14 @@ class CheckListBox(ListBox):
         return _controls_.CheckListBox_Create(*args, **kwargs)
 
     def IsChecked(*args, **kwargs):
-        """IsChecked(self, int index) -> bool"""
+        """IsChecked(self, unsigned int index) -> bool"""
         return _controls_.CheckListBox_IsChecked(*args, **kwargs)
 
     def Check(*args, **kwargs):
-        """Check(self, int index, int check=True)"""
+        """Check(self, unsigned int index, int check=True)"""
         return _controls_.CheckListBox_Check(*args, **kwargs)
 
-CheckListBox_swigregister = _controls_.CheckListBox_swigregister
-CheckListBox_swigregister(CheckListBox)
+_controls_.CheckListBox_swigregister(CheckListBox)
 
 def PreCheckListBox(*args, **kwargs):
     """PreCheckListBox() -> CheckListBox"""
@@ -1470,9 +1466,9 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP
-TE_LINEWRAP = _controls_.TE_LINEWRAP
 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE
+TE_LINEWRAP = TE_CHARWRAP 
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
@@ -1514,6 +1510,11 @@ class TextAttr(object):
         """Init(self)"""
         return _controls_.TextAttr_Init(*args, **kwargs)
 
+    def Merge(*args, **kwargs):
+        """Merge(TextAttr base, TextAttr overlay) -> TextAttr"""
+        return _controls_.TextAttr_Merge(*args, **kwargs)
+
+    Merge = staticmethod(Merge)
     def SetTextColour(*args, **kwargs):
         """SetTextColour(self, Colour colText)"""
         return _controls_.TextAttr_SetTextColour(*args, **kwargs)
@@ -1623,10 +1624,13 @@ class TextAttr(object):
         return _controls_.TextAttr_Combine(*args, **kwargs)
 
     Combine = staticmethod(Combine)
-TextAttr_swigregister = _controls_.TextAttr_swigregister
-TextAttr_swigregister(TextAttr)
+_controls_.TextAttr_swigregister(TextAttr)
 TextCtrlNameStr = cvar.TextCtrlNameStr
 
+def TextAttr_Merge(*args, **kwargs):
+  """TextAttr_Merge(TextAttr base, TextAttr overlay) -> TextAttr"""
+  return _controls_.TextAttr_Merge(*args, **kwargs)
+
 def TextAttr_Combine(*args, **kwargs):
   """TextAttr_Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
   return _controls_.TextAttr_Combine(*args, **kwargs)
@@ -1734,6 +1738,10 @@ class TextCtrl(_core.Control):
         """DiscardEdits(self)"""
         return _controls_.TextCtrl_DiscardEdits(*args, **kwargs)
 
+    def SetModified(*args, **kwargs):
+        """SetModified(self, bool modified)"""
+        return _controls_.TextCtrl_SetModified(*args, **kwargs)
+
     def SetMaxLength(*args, **kwargs):
         """SetMaxLength(self, unsigned long len)"""
         return _controls_.TextCtrl_SetMaxLength(*args, **kwargs)
@@ -1892,8 +1900,7 @@ class TextCtrl(_core.Control):
         return _controls_.TextCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-TextCtrl_swigregister = _controls_.TextCtrl_swigregister
-TextCtrl_swigregister(TextCtrl)
+_controls_.TextCtrl_swigregister(TextCtrl)
 
 def PreTextCtrl(*args, **kwargs):
     """PreTextCtrl() -> TextCtrl"""
@@ -1940,8 +1947,7 @@ class TextUrlEvent(_core.CommandEvent):
         """GetURLEnd(self) -> long"""
         return _controls_.TextUrlEvent_GetURLEnd(*args, **kwargs)
 
-TextUrlEvent_swigregister = _controls_.TextUrlEvent_swigregister
-TextUrlEvent_swigregister(TextUrlEvent)
+_controls_.TextUrlEvent_swigregister(TextUrlEvent)
 
 EVT_TEXT        = wx.PyEventBinder( wxEVT_COMMAND_TEXT_UPDATED, 1)
 EVT_TEXT_ENTER  = wx.PyEventBinder( wxEVT_COMMAND_TEXT_ENTER, 1)
@@ -2016,8 +2022,7 @@ class ScrollBar(_core.Control):
         return _controls_.ScrollBar_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-ScrollBar_swigregister = _controls_.ScrollBar_swigregister
-ScrollBar_swigregister(ScrollBar)
+_controls_.ScrollBar_swigregister(ScrollBar)
 ScrollBarNameStr = cvar.ScrollBarNameStr
 
 def PreScrollBar(*args, **kwargs):
@@ -2119,8 +2124,7 @@ class SpinButton(_core.Control):
         return _controls_.SpinButton_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-SpinButton_swigregister = _controls_.SpinButton_swigregister
-SpinButton_swigregister(SpinButton)
+_controls_.SpinButton_swigregister(SpinButton)
 SPIN_BUTTON_NAME = cvar.SPIN_BUTTON_NAME
 SpinCtrlNameStr = cvar.SpinCtrlNameStr
 
@@ -2215,8 +2219,7 @@ class SpinCtrl(_core.Control):
         return _controls_.SpinCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-SpinCtrl_swigregister = _controls_.SpinCtrl_swigregister
-SpinCtrl_swigregister(SpinCtrl)
+_controls_.SpinCtrl_swigregister(SpinCtrl)
 
 def PreSpinCtrl(*args, **kwargs):
     """PreSpinCtrl() -> SpinCtrl"""
@@ -2245,7 +2248,7 @@ class SpinEvent(_core.NotifyEvent):
     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, wxEventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent"""
+        """__init__(self, EventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent"""
         _controls_.SpinEvent_swiginit(self,_controls_.new_SpinEvent(*args, **kwargs))
     def GetPosition(*args, **kwargs):
         """GetPosition(self) -> int"""
@@ -2255,8 +2258,7 @@ class SpinEvent(_core.NotifyEvent):
         """SetPosition(self, int pos)"""
         return _controls_.SpinEvent_SetPosition(*args, **kwargs)
 
-SpinEvent_swigregister = _controls_.SpinEvent_swigregister
-SpinEvent_swigregister(SpinEvent)
+_controls_.SpinEvent_swigregister(SpinEvent)
 
 wxEVT_COMMAND_SPINCTRL_UPDATED = _controls_.wxEVT_COMMAND_SPINCTRL_UPDATED
 EVT_SPIN_UP   = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1)
@@ -2311,7 +2313,7 @@ class RadioBox(_core.Control):
         return _controls_.RadioBox_SetStringSelection(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
-        """GetCount(self) -> int"""
+        """GetCount(self) -> size_t"""
         return _controls_.RadioBox_GetCount(*args, **kwargs)
 
     def FindString(*args, **kwargs):
@@ -2329,25 +2331,49 @@ class RadioBox(_core.Control):
     GetItemLabel = GetString 
     SetItemLabel = SetString 
     def EnableItem(*args, **kwargs):
-        """EnableItem(self, int n, bool enable=True)"""
+        """EnableItem(self, unsigned int n, bool enable=True)"""
         return _controls_.RadioBox_EnableItem(*args, **kwargs)
 
     def ShowItem(*args, **kwargs):
-        """ShowItem(self, int n, bool show=True)"""
+        """ShowItem(self, unsigned int n, bool show=True)"""
         return _controls_.RadioBox_ShowItem(*args, **kwargs)
 
+    def IsItemEnabled(*args, **kwargs):
+        """IsItemEnabled(self, unsigned int n) -> bool"""
+        return _controls_.RadioBox_IsItemEnabled(*args, **kwargs)
+
+    def IsItemShown(*args, **kwargs):
+        """IsItemShown(self, unsigned int n) -> bool"""
+        return _controls_.RadioBox_IsItemShown(*args, **kwargs)
+
     def GetColumnCount(*args, **kwargs):
-        """GetColumnCount(self) -> int"""
+        """GetColumnCount(self) -> unsigned int"""
         return _controls_.RadioBox_GetColumnCount(*args, **kwargs)
 
     def GetRowCount(*args, **kwargs):
-        """GetRowCount(self) -> int"""
+        """GetRowCount(self) -> unsigned int"""
         return _controls_.RadioBox_GetRowCount(*args, **kwargs)
 
     def GetNextItem(*args, **kwargs):
         """GetNextItem(self, int item, int dir, long style) -> int"""
         return _controls_.RadioBox_GetNextItem(*args, **kwargs)
 
+    def SetItemToolTip(*args, **kwargs):
+        """SetItemToolTip(self, unsigned int item, String text)"""
+        return _controls_.RadioBox_SetItemToolTip(*args, **kwargs)
+
+    def GetItemToolTip(*args, **kwargs):
+        """GetItemToolTip(self, unsigned int item) -> ToolTip"""
+        return _controls_.RadioBox_GetItemToolTip(*args, **kwargs)
+
+    def SetItemHelpText(*args, **kwargs):
+        """SetItemHelpText(self, unsigned int n, String helpText)"""
+        return _controls_.RadioBox_SetItemHelpText(*args, **kwargs)
+
+    def GetItemHelpText(*args, **kwargs):
+        """GetItemHelpText(self, unsigned int n) -> String"""
+        return _controls_.RadioBox_GetItemHelpText(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -2366,8 +2392,7 @@ class RadioBox(_core.Control):
         return _controls_.RadioBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-RadioBox_swigregister = _controls_.RadioBox_swigregister
-RadioBox_swigregister(RadioBox)
+_controls_.RadioBox_swigregister(RadioBox)
 RadioBoxNameStr = cvar.RadioBoxNameStr
 RadioButtonNameStr = cvar.RadioButtonNameStr
 
@@ -2444,8 +2469,7 @@ class RadioButton(_core.Control):
         return _controls_.RadioButton_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-RadioButton_swigregister = _controls_.RadioButton_swigregister
-RadioButton_swigregister(RadioButton)
+_controls_.RadioButton_swigregister(RadioButton)
 
 def PreRadioButton(*args, **kwargs):
     """PreRadioButton() -> RadioButton"""
@@ -2611,8 +2635,7 @@ class Slider(_core.Control):
         return _controls_.Slider_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Slider_swigregister = _controls_.Slider_swigregister
-Slider_swigregister(Slider)
+_controls_.Slider_swigregister(Slider)
 SliderNameStr = cvar.SliderNameStr
 
 def PreSlider(*args, **kwargs):
@@ -2691,8 +2714,7 @@ class ToggleButton(_core.Control):
         return _controls_.ToggleButton_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-ToggleButton_swigregister = _controls_.ToggleButton_swigregister
-ToggleButton_swigregister(ToggleButton)
+_controls_.ToggleButton_swigregister(ToggleButton)
 ToggleButtonNameStr = cvar.ToggleButtonNameStr
 
 def PreToggleButton(*args, **kwargs):
@@ -2725,6 +2747,12 @@ BK_BOTTOM = _controls_.BK_BOTTOM
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK
+BK_BUTTONBAR = _controls_.BK_BUTTONBAR
+BK_HITTEST_NOWHERE = _controls_.BK_HITTEST_NOWHERE
+BK_HITTEST_ONICON = _controls_.BK_HITTEST_ONICON
+BK_HITTEST_ONLABEL = _controls_.BK_HITTEST_ONLABEL
+BK_HITTEST_ONITEM = _controls_.BK_HITTEST_ONITEM
+BK_HITTEST_ONPAGE = _controls_.BK_HITTEST_ONPAGE
 class BookCtrlBase(_core.Control):
     """Proxy of C++ BookCtrlBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -2794,6 +2822,14 @@ class BookCtrlBase(_core.Control):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 
+    def SetControlMargin(*args, **kwargs):
+        """SetControlMargin(self, int margin)"""
+        return _controls_.BookCtrlBase_SetControlMargin(*args, **kwargs)
+
+    def GetControlMargin(*args, **kwargs):
+        """GetControlMargin(self) -> int"""
+        return _controls_.BookCtrlBase_GetControlMargin(*args, **kwargs)
+
     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)
@@ -2802,6 +2838,10 @@ class BookCtrlBase(_core.Control):
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 
+    def GetControlSizer(*args, **kwargs):
+        """GetControlSizer(self) -> Sizer"""
+        return _controls_.BookCtrlBase_GetControlSizer(*args, **kwargs)
+
     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)
@@ -2833,6 +2873,15 @@ class BookCtrlBase(_core.Control):
         """AdvanceSelection(self, bool forward=True)"""
         return _controls_.BookCtrlBase_AdvanceSelection(*args, **kwargs)
 
+    def HitTest(*args, **kwargs):
+        """
+        HitTest(Point pt) -> (tab, where)
+
+        Returns the page/tab which is hit, and flags indicating where using
+        wx.NB_HITTEST flags.
+        """
+        return _controls_.BookCtrlBase_HitTest(*args, **kwargs)
+
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -2851,8 +2900,7 @@ class BookCtrlBase(_core.Control):
         return _controls_.BookCtrlBase_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-BookCtrlBase_swigregister = _controls_.BookCtrlBase_swigregister
-BookCtrlBase_swigregister(BookCtrlBase)
+_controls_.BookCtrlBase_swigregister(BookCtrlBase)
 NotebookNameStr = cvar.NotebookNameStr
 
 def BookCtrlBase_GetClassDefaultAttributes(*args, **kwargs):
@@ -2878,7 +2926,7 @@ class BookCtrlBaseEvent(_core.NotifyEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
             int nOldSel=-1) -> BookCtrlBaseEvent
         """
         _controls_.BookCtrlBaseEvent_swiginit(self,_controls_.new_BookCtrlBaseEvent(*args, **kwargs))
@@ -2903,8 +2951,7 @@ class BookCtrlBaseEvent(_core.NotifyEvent):
         """SetOldSelection(self, int nOldSel)"""
         return _controls_.BookCtrlBaseEvent_SetOldSelection(*args, **kwargs)
 
-BookCtrlBaseEvent_swigregister = _controls_.BookCtrlBaseEvent_swigregister
-BookCtrlBaseEvent_swigregister(BookCtrlBaseEvent)
+_controls_.BookCtrlBaseEvent_swigregister(BookCtrlBaseEvent)
 
 #---------------------------------------------------------------------------
 
@@ -2919,6 +2966,7 @@ NB_HITTEST_NOWHERE = _controls_.NB_HITTEST_NOWHERE
 NB_HITTEST_ONICON = _controls_.NB_HITTEST_ONICON
 NB_HITTEST_ONLABEL = _controls_.NB_HITTEST_ONLABEL
 NB_HITTEST_ONITEM = _controls_.NB_HITTEST_ONITEM
+NB_HITTEST_ONPAGE = _controls_.NB_HITTEST_ONPAGE
 class Notebook(BookCtrlBase):
     """Proxy of C++ Notebook class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -2950,15 +2998,6 @@ class Notebook(BookCtrlBase):
         """SetTabSize(self, Size sz)"""
         return _controls_.Notebook_SetTabSize(*args, **kwargs)
 
-    def HitTest(*args, **kwargs):
-        """
-        HitTest(Point pt) -> (tab, where)
-
-        Returns the tab which is hit, and flags indicating where using
-        wx.NB_HITTEST flags.
-        """
-        return _controls_.Notebook_HitTest(*args, **kwargs)
-
     def GetThemeBackgroundColour(*args, **kwargs):
         """GetThemeBackgroundColour(self) -> Colour"""
         return _controls_.Notebook_GetThemeBackgroundColour(*args, **kwargs)
@@ -2981,8 +3020,7 @@ class Notebook(BookCtrlBase):
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Notebook_swigregister = _controls_.Notebook_swigregister
-Notebook_swigregister(Notebook)
+_controls_.Notebook_swigregister(Notebook)
 
 def PreNotebook(*args, **kwargs):
     """PreNotebook() -> Notebook"""
@@ -3012,12 +3050,11 @@ class NotebookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
             int nOldSel=-1) -> NotebookEvent
         """
         _controls_.NotebookEvent_swiginit(self,_controls_.new_NotebookEvent(*args, **kwargs))
-NotebookEvent_swigregister = _controls_.NotebookEvent_swigregister
-NotebookEvent_swigregister(NotebookEvent)
+_controls_.NotebookEvent_swigregister(NotebookEvent)
 
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
@@ -3086,8 +3123,7 @@ class Listbook(BookCtrlBase):
         """GetListView(self) -> ListView"""
         return _controls_.Listbook_GetListView(*args, **kwargs)
 
-Listbook_swigregister = _controls_.Listbook_swigregister
-Listbook_swigregister(Listbook)
+_controls_.Listbook_swigregister(Listbook)
 
 def PreListbook(*args, **kwargs):
     """PreListbook() -> Listbook"""
@@ -3100,12 +3136,11 @@ class ListbookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
             int nOldSel=-1) -> ListbookEvent
         """
         _controls_.ListbookEvent_swiginit(self,_controls_.new_ListbookEvent(*args, **kwargs))
-ListbookEvent_swigregister = _controls_.ListbookEvent_swigregister
-ListbookEvent_swigregister(ListbookEvent)
+_controls_.ListbookEvent_swigregister(ListbookEvent)
 
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
@@ -3141,8 +3176,7 @@ class Choicebook(BookCtrlBase):
         """GetChoiceCtrl(self) -> Choice"""
         return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs)
 
-Choicebook_swigregister = _controls_.Choicebook_swigregister
-Choicebook_swigregister(Choicebook)
+_controls_.Choicebook_swigregister(Choicebook)
 
 def PreChoicebook(*args, **kwargs):
     """PreChoicebook() -> Choicebook"""
@@ -3155,12 +3189,11 @@ class ChoicebookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
             int nOldSel=-1) -> ChoicebookEvent
         """
         _controls_.ChoicebookEvent_swiginit(self,_controls_.new_ChoicebookEvent(*args, **kwargs))
-ChoicebookEvent_swigregister = _controls_.ChoicebookEvent_swigregister
-ChoicebookEvent_swigregister(ChoicebookEvent)
+_controls_.ChoicebookEvent_swigregister(ChoicebookEvent)
 
 wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
@@ -3218,11 +3251,10 @@ class Treebook(BookCtrlBase):
         return _controls_.Treebook_GetPageParent(*args, **kwargs)
 
     def GetTreeCtrl(*args, **kwargs):
-        """GetTreeCtrl(self) -> wxTreeCtrl"""
+        """GetTreeCtrl(self) -> TreeCtrl"""
         return _controls_.Treebook_GetTreeCtrl(*args, **kwargs)
 
-Treebook_swigregister = _controls_.Treebook_swigregister
-Treebook_swigregister(Treebook)
+_controls_.Treebook_swigregister(Treebook)
 
 def PreTreebook(*args, **kwargs):
     """PreTreebook() -> Treebook"""
@@ -3235,12 +3267,11 @@ class TreebookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, 
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, 
             int nOldSel=NOT_FOUND) -> TreebookEvent
         """
         _controls_.TreebookEvent_swiginit(self,_controls_.new_TreebookEvent(*args, **kwargs))
-TreebookEvent_swigregister = _controls_.TreebookEvent_swigregister
-TreebookEvent_swigregister(TreebookEvent)
+_controls_.TreebookEvent_swigregister(TreebookEvent)
 
 wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING
@@ -3281,8 +3312,7 @@ class Toolbook(BookCtrlBase):
         """Realize(self)"""
         return _controls_.Toolbook_Realize(*args, **kwargs)
 
-Toolbook_swigregister = _controls_.Toolbook_swigregister
-Toolbook_swigregister(Toolbook)
+_controls_.Toolbook_swigregister(Toolbook)
 
 def PreToolbook(*args, **kwargs):
     """PreToolbook() -> Toolbook"""
@@ -3295,12 +3325,11 @@ class ToolbookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, 
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, 
             int nOldSel=NOT_FOUND) -> ToolbookEvent
         """
         _controls_.ToolbookEvent_swiginit(self,_controls_.new_ToolbookEvent(*args, **kwargs))
-ToolbookEvent_swigregister = _controls_.ToolbookEvent_swigregister
-ToolbookEvent_swigregister(ToolbookEvent)
+_controls_.ToolbookEvent_swigregister(ToolbookEvent)
 
 wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED
 wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING
@@ -3323,6 +3352,7 @@ TB_NODIVIDER = _controls_.TB_NODIVIDER
 TB_NOALIGN = _controls_.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
+TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -3449,8 +3479,7 @@ class ToolBarToolBase(_core.Object):
     SetBitmap1 = SetNormalBitmap
     SetBitmap2 = SetDisabledBitmap
 
-ToolBarToolBase_swigregister = _controls_.ToolBarToolBase_swigregister
-ToolBarToolBase_swigregister(ToolBarToolBase)
+_controls_.ToolBarToolBase_swigregister(ToolBarToolBase)
 
 class ToolBarBase(_core.Control):
     """Proxy of C++ ToolBarBase class"""
@@ -3771,8 +3800,7 @@ class ToolBarBase(_core.Control):
         """GetToolsCount(self) -> size_t"""
         return _controls_.ToolBarBase_GetToolsCount(*args, **kwargs)
 
-ToolBarBase_swigregister = _controls_.ToolBarBase_swigregister
-ToolBarBase_swigregister(ToolBarBase)
+_controls_.ToolBarBase_swigregister(ToolBarBase)
 
 class ToolBar(ToolBarBase):
     """Proxy of C++ ToolBar class"""
@@ -3795,10 +3823,6 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
-    def FindToolForPosition(*args, **kwargs):
-        """FindToolForPosition(self, int x, int y) -> ToolBarToolBase"""
-        return _controls_.ToolBar_FindToolForPosition(*args, **kwargs)
-
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -3817,8 +3841,7 @@ class ToolBar(ToolBarBase):
         return _controls_.ToolBar_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-ToolBar_swigregister = _controls_.ToolBar_swigregister
-ToolBar_swigregister(ToolBar)
+_controls_.ToolBar_swigregister(ToolBar)
 
 def PreToolBar(*args, **kwargs):
     """PreToolBar() -> ToolBar"""
@@ -3890,6 +3913,7 @@ LIST_HITTEST_ONITEMSTATEICON = _controls_.LIST_HITTEST_ONITEMSTATEICON
 LIST_HITTEST_TOLEFT = _controls_.LIST_HITTEST_TOLEFT
 LIST_HITTEST_TORIGHT = _controls_.LIST_HITTEST_TORIGHT
 LIST_HITTEST_ONITEM = _controls_.LIST_HITTEST_ONITEM
+LIST_GETSUBITEMRECT_WHOLEITEM = _controls_.LIST_GETSUBITEMRECT_WHOLEITEM
 LIST_NEXT_ABOVE = _controls_.LIST_NEXT_ABOVE
 LIST_NEXT_ALL = _controls_.LIST_NEXT_ALL
 LIST_NEXT_BELOW = _controls_.LIST_NEXT_BELOW
@@ -3972,8 +3996,7 @@ class ListItemAttr(object):
         args[0].thisown = 0
         return val
 
-ListItemAttr_swigregister = _controls_.ListItemAttr_swigregister
-ListItemAttr_swigregister(ListItemAttr)
+_controls_.ListItemAttr_swigregister(ListItemAttr)
 ListCtrlNameStr = cvar.ListCtrlNameStr
 
 #---------------------------------------------------------------------------
@@ -4113,8 +4136,7 @@ class ListItem(_core.Object):
     m_data = property(_controls_.ListItem_m_data_get, _controls_.ListItem_m_data_set)
     m_format = property(_controls_.ListItem_m_format_get, _controls_.ListItem_m_format_set)
     m_width = property(_controls_.ListItem_m_width_get, _controls_.ListItem_m_width_set)
-ListItem_swigregister = _controls_.ListItem_swigregister
-ListItem_swigregister(ListItem)
+_controls_.ListItem_swigregister(ListItem)
 
 #---------------------------------------------------------------------------
 
@@ -4123,7 +4145,7 @@ class ListEvent(_core.NotifyEvent):
     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, wxEventType commandType=wxEVT_NULL, int id=0) -> ListEvent"""
+        """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> ListEvent"""
         _controls_.ListEvent_swiginit(self,_controls_.new_ListEvent(*args, **kwargs))
     m_code = property(_controls_.ListEvent_m_code_get, _controls_.ListEvent_m_code_set)
     m_oldItemIndex = property(_controls_.ListEvent_m_oldItemIndex_get, _controls_.ListEvent_m_oldItemIndex_set)
@@ -4189,8 +4211,7 @@ class ListEvent(_core.NotifyEvent):
         """SetEditCanceled(self, bool editCancelled)"""
         return _controls_.ListEvent_SetEditCanceled(*args, **kwargs)
 
-ListEvent_swigregister = _controls_.ListEvent_swigregister
-ListEvent_swigregister(ListEvent)
+_controls_.ListEvent_swigregister(ListEvent)
 
 wxEVT_COMMAND_LIST_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_BEGIN_DRAG
 wxEVT_COMMAND_LIST_BEGIN_RDRAG = _controls_.wxEVT_COMMAND_LIST_BEGIN_RDRAG
@@ -4370,10 +4391,12 @@ class ListCtrl(_core.Control):
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 
+    GetItemSpacing = wx._deprecated(GetItemSpacing) 
     def SetItemSpacing(*args, **kwargs):
         """SetItemSpacing(self, int spacing, bool isSmall=False)"""
         return _controls_.ListCtrl_SetItemSpacing(*args, **kwargs)
 
+    SetItemSpacing = wx._deprecated(SetItemSpacing) 
     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)
@@ -4479,6 +4502,16 @@ class ListCtrl(_core.Control):
         """
         return _controls_.ListCtrl_HitTest(*args, **kwargs)
 
+    def HitTestSubItem(*args, **kwargs):
+        """
+        HitTestSubItem(Point point) -> (item, where, subItem)
+
+        Determines which item (if any) is at the specified point, giving  in
+        the second return value (see wx.LIST_HITTEST flags) and also the subItem, if
+        any.
+        """
+        return _controls_.ListCtrl_HitTestSubItem(*args, **kwargs)
+
     def InsertItem(*args, **kwargs):
         """InsertItem(self, ListItem info) -> long"""
         return _controls_.ListCtrl_InsertItem(*args, **kwargs)
@@ -4624,8 +4657,7 @@ class ListCtrl(_core.Control):
         return _controls_.ListCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-ListCtrl_swigregister = _controls_.ListCtrl_swigregister
-ListCtrl_swigregister(ListCtrl)
+_controls_.ListCtrl_swigregister(ListCtrl)
 
 def PreListCtrl(*args, **kwargs):
     """PreListCtrl() -> ListCtrl"""
@@ -4706,8 +4738,7 @@ class ListView(ListCtrl):
         """ClearColumnImage(self, int col)"""
         return _controls_.ListView_ClearColumnImage(*args, **kwargs)
 
-ListView_swigregister = _controls_.ListView_swigregister
-ListView_swigregister(ListView)
+_controls_.ListView_swigregister(ListView)
 
 def PreListView(*args, **kwargs):
     """PreListView() -> ListView"""
@@ -4730,8 +4761,10 @@ TR_ROW_LINES = _controls_.TR_ROW_LINES
 TR_FULL_ROW_HIGHLIGHT = _controls_.TR_FULL_ROW_HIGHLIGHT
 TR_DEFAULT_STYLE = _controls_.TR_DEFAULT_STYLE
 TR_TWIST_BUTTONS = _controls_.TR_TWIST_BUTTONS
-TR_MAC_BUTTONS = _controls_.TR_MAC_BUTTONS
-TR_AQUA_BUTTONS = _controls_.TR_AQUA_BUTTONS
+# obsolete
+TR_MAC_BUTTONS = 0
+wxTR_AQUA_BUTTONS = 0
+
 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded
@@ -4777,8 +4810,7 @@ class TreeItemId(object):
     m_pItem = property(_controls_.TreeItemId_m_pItem_get, _controls_.TreeItemId_m_pItem_set)
     Ok = IsOk
     def __nonzero__(self): return self.IsOk() 
-TreeItemId_swigregister = _controls_.TreeItemId_swigregister
-TreeItemId_swigregister(TreeItemId)
+_controls_.TreeItemId_swigregister(TreeItemId)
 TreeCtrlNameStr = cvar.TreeCtrlNameStr
 
 class TreeItemData(object):
@@ -4812,8 +4844,7 @@ class TreeItemData(object):
         args[0].thisown = 0
         return val
 
-TreeItemData_swigregister = _controls_.TreeItemData_swigregister
-TreeItemData_swigregister(TreeItemData)
+_controls_.TreeItemData_swigregister(TreeItemData)
 
 #---------------------------------------------------------------------------
 
@@ -4858,15 +4889,18 @@ EVT_TREE_ITEM_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLI
 EVT_TREE_END_DRAG          = wx.PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG         , 1)
 EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1)
 EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,   1)
-EVT_TREE_ITEM_MENU        = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU,         1)
+EVT_TREE_ITEM_MENU         = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU,         1)
 
 class TreeEvent(_core.NotifyEvent):
     """Proxy of C++ TreeEvent 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, wxEventType commandType=wxEVT_NULL, int id=0) -> TreeEvent"""
-        _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args, **kwargs))
+    def __init__(self, *args): 
+        """
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent
+        __init__(self, EventType commandType, TreeCtrl tree, TreeItemId item=NullTreeItemId) -> TreeEvent
+        """
+        _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args))
     def GetItem(*args, **kwargs):
         """GetItem(self) -> TreeItemId"""
         return _controls_.TreeEvent_GetItem(*args, **kwargs)
@@ -4927,8 +4961,7 @@ class TreeEvent(_core.NotifyEvent):
         """GetToolTip(self) -> String"""
         return _controls_.TreeEvent_GetToolTip(*args, **kwargs)
 
-TreeEvent_swigregister = _controls_.TreeEvent_swigregister
-TreeEvent_swigregister(TreeEvent)
+_controls_.TreeEvent_swigregister(TreeEvent)
 
 #---------------------------------------------------------------------------
 
@@ -4962,7 +4995,7 @@ class TreeCtrl(_core.Control):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
-        """GetCount(self) -> size_t"""
+        """GetCount(self) -> unsigned int"""
         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):
@@ -5195,6 +5228,14 @@ class TreeCtrl(_core.Control):
         """Expand(self, TreeItemId item)"""
         return _controls_.TreeCtrl_Expand(*args, **kwargs)
 
+    def ExpandAllChildren(*args, **kwargs):
+        """ExpandAllChildren(self, TreeItemId item)"""
+        return _controls_.TreeCtrl_ExpandAllChildren(*args, **kwargs)
+
+    def ExpandAll(*args, **kwargs):
+        """ExpandAll(self)"""
+        return _controls_.TreeCtrl_ExpandAll(*args, **kwargs)
+
     def Collapse(*args, **kwargs):
         """Collapse(self, TreeItemId item)"""
         return _controls_.TreeCtrl_Collapse(*args, **kwargs)
@@ -5280,8 +5321,15 @@ class TreeCtrl(_core.Control):
         return _controls_.TreeCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-TreeCtrl_swigregister = _controls_.TreeCtrl_swigregister
-TreeCtrl_swigregister(TreeCtrl)
+    def SetQuickBestSize(*args, **kwargs):
+        """SetQuickBestSize(self, bool q)"""
+        return _controls_.TreeCtrl_SetQuickBestSize(*args, **kwargs)
+
+    def GetQuickBestSize(*args, **kwargs):
+        """GetQuickBestSize(self) -> bool"""
+        return _controls_.TreeCtrl_GetQuickBestSize(*args, **kwargs)
+
+_controls_.TreeCtrl_swigregister(TreeCtrl)
 
 def PreTreeCtrl(*args, **kwargs):
     """PreTreeCtrl() -> TreeCtrl"""
@@ -5341,6 +5389,10 @@ class GenericDirCtrl(_core.Control):
         """ExpandPath(self, String path) -> bool"""
         return _controls_.GenericDirCtrl_ExpandPath(*args, **kwargs)
 
+    def CollapsePath(*args, **kwargs):
+        """CollapsePath(self, String path) -> bool"""
+        return _controls_.GenericDirCtrl_CollapsePath(*args, **kwargs)
+
     def GetDefaultPath(*args, **kwargs):
         """GetDefaultPath(self) -> String"""
         return _controls_.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
@@ -5417,8 +5469,7 @@ class GenericDirCtrl(_core.Control):
         """ReCreateTree(self)"""
         return _controls_.GenericDirCtrl_ReCreateTree(*args, **kwargs)
 
-GenericDirCtrl_swigregister = _controls_.GenericDirCtrl_swigregister
-GenericDirCtrl_swigregister(GenericDirCtrl)
+_controls_.GenericDirCtrl_swigregister(GenericDirCtrl)
 DirDialogDefaultFolderStr = cvar.DirDialogDefaultFolderStr
 
 def PreGenericDirCtrl(*args, **kwargs):
@@ -5449,8 +5500,7 @@ class DirFilterListCtrl(Choice):
         """FillFilterList(self, String filter, int defaultFilter)"""
         return _controls_.DirFilterListCtrl_FillFilterList(*args, **kwargs)
 
-DirFilterListCtrl_swigregister = _controls_.DirFilterListCtrl_swigregister
-DirFilterListCtrl_swigregister(DirFilterListCtrl)
+_controls_.DirFilterListCtrl_swigregister(DirFilterListCtrl)
 
 def PreDirFilterListCtrl(*args, **kwargs):
     """PreDirFilterListCtrl() -> DirFilterListCtrl"""
@@ -5633,8 +5683,7 @@ class PyControl(_core.Control):
     base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
                                    "Please use PyScrolledWindow.OnInternalIdle instead.")
 
-PyControl_swigregister = _controls_.PyControl_swigregister
-PyControl_swigregister(PyControl)
+_controls_.PyControl_swigregister(PyControl)
 
 def PrePyControl(*args, **kwargs):
     """PrePyControl() -> PyControl"""
@@ -5672,8 +5721,14 @@ class HelpEvent(_core.CommandEvent):
     """
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
+    Origin_Unknown = _controls_.HelpEvent_Origin_Unknown
+    Origin_Keyboard = _controls_.HelpEvent_Origin_Keyboard
+    Origin_HelpButton = _controls_.HelpEvent_Origin_HelpButton
     def __init__(self, *args, **kwargs): 
-        """__init__(self, wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
+        """
+        __init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition, 
+            int origin=Origin_Unknown) -> HelpEvent
+        """
         _controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
     def GetPosition(*args, **kwargs):
         """
@@ -5725,8 +5780,19 @@ class HelpEvent(_core.CommandEvent):
         """
         return _controls_.HelpEvent_SetTarget(*args, **kwargs)
 
-HelpEvent_swigregister = _controls_.HelpEvent_swigregister
-HelpEvent_swigregister(HelpEvent)
+    def GetOrigin(*args, **kwargs):
+        """
+        GetOrigin(self) -> int
+
+        Optiononal indication of the source of the event.
+        """
+        return _controls_.HelpEvent_GetOrigin(*args, **kwargs)
+
+    def SetOrigin(*args, **kwargs):
+        """SetOrigin(self, int origin)"""
+        return _controls_.HelpEvent_SetOrigin(*args, **kwargs)
+
+_controls_.HelpEvent_swigregister(HelpEvent)
 
 class ContextHelp(_core.Object):
     """
@@ -5789,8 +5855,7 @@ class ContextHelp(_core.Object):
         """
         return _controls_.ContextHelp_EndContextHelp(*args, **kwargs)
 
-ContextHelp_swigregister = _controls_.ContextHelp_swigregister
-ContextHelp_swigregister(ContextHelp)
+_controls_.ContextHelp_swigregister(ContextHelp)
 
 class ContextHelpButton(BitmapButton):
     """
@@ -5819,8 +5884,7 @@ class ContextHelpButton(BitmapButton):
         _controls_.ContextHelpButton_swiginit(self,_controls_.new_ContextHelpButton(*args, **kwargs))
         self._setOORInfo(self)
 
-ContextHelpButton_swigregister = _controls_.ContextHelpButton_swigregister
-ContextHelpButton_swigregister(ContextHelpButton)
+_controls_.ContextHelpButton_swigregister(ContextHelpButton)
 
 class HelpProvider(object):
     """
@@ -5834,6 +5898,8 @@ class HelpProvider(object):
     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
+    __swig_destroy__ = _controls_.delete_HelpProvider
+    __del__ = lambda self : None;
     def Set(*args, **kwargs):
         """
         Set(HelpProvider helpProvider) -> HelpProvider
@@ -5874,6 +5940,16 @@ class HelpProvider(object):
         """
         return _controls_.HelpProvider_ShowHelp(*args, **kwargs)
 
+    def ShowHelpAtPoint(*args, **kwargs):
+        """
+        ShowHelpAtPoint(self, wxWindowBase window, Point pt, int origin) -> bool
+
+        Show help for the given window (uses window.GetHelpAtPoint()
+        internally if applicable), return true if it was done or false if no
+        help available for this window.
+        """
+        return _controls_.HelpProvider_ShowHelpAtPoint(*args, **kwargs)
+
     def AddHelp(*args, **kwargs):
         """
         AddHelp(self, Window window, String text)
@@ -5909,8 +5985,7 @@ class HelpProvider(object):
         args[0].thisown = 0
         return val
 
-HelpProvider_swigregister = _controls_.HelpProvider_swigregister
-HelpProvider_swigregister(HelpProvider)
+_controls_.HelpProvider_swigregister(HelpProvider)
 
 def HelpProvider_Set(*args, **kwargs):
   """
@@ -5947,8 +6022,7 @@ class SimpleHelpProvider(HelpProvider):
         with the control (if any) in a tooltip.
         """
         _controls_.SimpleHelpProvider_swiginit(self,_controls_.new_SimpleHelpProvider(*args, **kwargs))
-SimpleHelpProvider_swigregister = _controls_.SimpleHelpProvider_swigregister
-SimpleHelpProvider_swigregister(SimpleHelpProvider)
+_controls_.SimpleHelpProvider_swigregister(SimpleHelpProvider)
 
 #---------------------------------------------------------------------------
 
@@ -6008,8 +6082,7 @@ class DragImage(_core.Object):
         """RedrawImage(self, Point oldPos, Point newPos, bool eraseOld, bool drawNew) -> bool"""
         return _controls_.DragImage_RedrawImage(*args, **kwargs)
 
-DragImage_swigregister = _controls_.DragImage_swigregister
-DragImage_swigregister(DragImage)
+_controls_.DragImage_swigregister(DragImage)
 
 def DragIcon(*args, **kwargs):
     """DragIcon(Icon image, Cursor cursor=wxNullCursor) -> DragImage"""
@@ -6129,8 +6202,7 @@ class DatePickerCtrl(_core.Control):
         """
         return _controls_.DatePickerCtrl_GetUpperLimit(*args, **kwargs)
 
-DatePickerCtrl_swigregister = _controls_.DatePickerCtrl_swigregister
-DatePickerCtrl_swigregister(DatePickerCtrl)
+_controls_.DatePickerCtrl_swigregister(DatePickerCtrl)
 DatePickerCtrlNameStr = cvar.DatePickerCtrlNameStr
 
 def PreDatePickerCtrl(*args, **kwargs):
@@ -6142,5 +6214,553 @@ def PreDatePickerCtrl(*args, **kwargs):
     val = _controls_.new_PreDatePickerCtrl(*args, **kwargs)
     return val
 
+HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU
+HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE
+#---------------------------------------------------------------------------
+
+class HyperlinkCtrl(_core.Control):
+    """
+    A static text control that emulates a hyperlink. The link is displayed
+    in an appropriate text style, derived from the control's normal font.
+    When the mouse rolls over the link, the cursor changes to a hand and
+    the link's color changes to the active color.
+
+    Clicking on the link does not launch a web browser; instead, a
+    wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
+    events.
+
+    """
+    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, Window parent, int id, String label, String url, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> HyperlinkCtrl
+
+        A static text control that emulates a hyperlink. The link is displayed
+        in an appropriate text style, derived from the control's normal font.
+        When the mouse rolls over the link, the cursor changes to a hand and
+        the link's color changes to the active color.
+
+        Clicking on the link does not launch a web browser; instead, a
+        wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
+        events.
+
+        """
+        _controls_.HyperlinkCtrl_swiginit(self,_controls_.new_HyperlinkCtrl(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id, String label, String url, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> bool
+        """
+        return _controls_.HyperlinkCtrl_Create(*args, **kwargs)
+
+    def GetHoverColour(*args, **kwargs):
+        """GetHoverColour(self) -> Colour"""
+        return _controls_.HyperlinkCtrl_GetHoverColour(*args, **kwargs)
+
+    def SetHoverColour(*args, **kwargs):
+        """SetHoverColour(self, Colour colour)"""
+        return _controls_.HyperlinkCtrl_SetHoverColour(*args, **kwargs)
+
+    def GetNormalColour(*args, **kwargs):
+        """GetNormalColour(self) -> Colour"""
+        return _controls_.HyperlinkCtrl_GetNormalColour(*args, **kwargs)
+
+    def SetNormalColour(*args, **kwargs):
+        """SetNormalColour(self, Colour colour)"""
+        return _controls_.HyperlinkCtrl_SetNormalColour(*args, **kwargs)
+
+    def GetVisitedColour(*args, **kwargs):
+        """GetVisitedColour(self) -> Colour"""
+        return _controls_.HyperlinkCtrl_GetVisitedColour(*args, **kwargs)
+
+    def SetVisitedColour(*args, **kwargs):
+        """SetVisitedColour(self, Colour colour)"""
+        return _controls_.HyperlinkCtrl_SetVisitedColour(*args, **kwargs)
+
+    def GetURL(*args, **kwargs):
+        """GetURL(self) -> String"""
+        return _controls_.HyperlinkCtrl_GetURL(*args, **kwargs)
+
+    def SetURL(*args, **kwargs):
+        """SetURL(self, String url)"""
+        return _controls_.HyperlinkCtrl_SetURL(*args, **kwargs)
+
+    def SetVisited(*args, **kwargs):
+        """SetVisited(self, bool visited=True)"""
+        return _controls_.HyperlinkCtrl_SetVisited(*args, **kwargs)
+
+    def GetVisited(*args, **kwargs):
+        """GetVisited(self) -> bool"""
+        return _controls_.HyperlinkCtrl_GetVisited(*args, **kwargs)
+
+_controls_.HyperlinkCtrl_swigregister(HyperlinkCtrl)
+HyperlinkCtrlNameStr = cvar.HyperlinkCtrlNameStr
+
+def PreHyperlinkCtrl(*args, **kwargs):
+    """
+    PreHyperlinkCtrl() -> HyperlinkCtrl
+
+    A static text control that emulates a hyperlink. The link is displayed
+    in an appropriate text style, derived from the control's normal font.
+    When the mouse rolls over the link, the cursor changes to a hand and
+    the link's color changes to the active color.
+
+    Clicking on the link does not launch a web browser; instead, a
+    wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
+    events.
+
+    """
+    val = _controls_.new_PreHyperlinkCtrl(*args, **kwargs)
+    return val
+
+wxEVT_COMMAND_HYPERLINK = _controls_.wxEVT_COMMAND_HYPERLINK
+class HyperlinkEvent(_core.CommandEvent):
+    """Proxy of C++ HyperlinkEvent 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, Object generator, int id, String url) -> HyperlinkEvent"""
+        _controls_.HyperlinkEvent_swiginit(self,_controls_.new_HyperlinkEvent(*args, **kwargs))
+    def GetURL(*args, **kwargs):
+        """GetURL(self) -> String"""
+        return _controls_.HyperlinkEvent_GetURL(*args, **kwargs)
+
+    def SetURL(*args, **kwargs):
+        """SetURL(self, String url)"""
+        return _controls_.HyperlinkEvent_SetURL(*args, **kwargs)
+
+_controls_.HyperlinkEvent_swigregister(HyperlinkEvent)
+
+EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 )
+
+#---------------------------------------------------------------------------
+
+PB_USE_TEXTCTRL = _controls_.PB_USE_TEXTCTRL
+class PickerBase(_core.Control):
+    """
+    Base abstract class for all pickers which support an auxiliary text
+    control. This class handles all positioning and sizing of the text
+    control like a an horizontal `wx.BoxSizer` would do, with the text
+    control on the left of the picker button and the proportion of the
+    picker fixed to value 1.
+    """
+    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
+    def CreateBase(*args, **kwargs):
+        """
+        CreateBase(self, Window parent, int id, String text=wxEmptyString, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=wxButtonNameStr) -> bool
+        """
+        return _controls_.PickerBase_CreateBase(*args, **kwargs)
+
+    def SetInternalMargin(*args, **kwargs):
+        """
+        SetInternalMargin(self, int newmargin)
+
+        Sets the margin (in pixels) between the picker and the text control.
+        """
+        return _controls_.PickerBase_SetInternalMargin(*args, **kwargs)
+
+    def GetInternalMargin(*args, **kwargs):
+        """
+        GetInternalMargin(self) -> int
+
+        Returns the margin (in pixels) between the picker and the text
+        control.
+        """
+        return _controls_.PickerBase_GetInternalMargin(*args, **kwargs)
+
+    def SetTextCtrlProportion(*args, **kwargs):
+        """
+        SetTextCtrlProportion(self, int prop)
+
+        Sets the proportion between the text control and the picker button.
+        This is used to set relative sizes of the text contorl and the picker.
+        The value passed to this function must be >= 1.
+        """
+        return _controls_.PickerBase_SetTextCtrlProportion(*args, **kwargs)
+
+    def GetTextCtrlProportion(*args, **kwargs):
+        """
+        GetTextCtrlProportion(self) -> int
+
+        Returns the proportion between the text control and the picker.
+        """
+        return _controls_.PickerBase_GetTextCtrlProportion(*args, **kwargs)
+
+    def SetPickerCtrlProportion(*args, **kwargs):
+        """
+        SetPickerCtrlProportion(self, int prop)
+
+        Sets the proportion value of the picker.
+        """
+        return _controls_.PickerBase_SetPickerCtrlProportion(*args, **kwargs)
+
+    def GetPickerCtrlProportion(*args, **kwargs):
+        """
+        GetPickerCtrlProportion(self) -> int
+
+        Gets the proportion value of the picker.
+        """
+        return _controls_.PickerBase_GetPickerCtrlProportion(*args, **kwargs)
+
+    def IsTextCtrlGrowable(*args, **kwargs):
+        """IsTextCtrlGrowable(self) -> bool"""
+        return _controls_.PickerBase_IsTextCtrlGrowable(*args, **kwargs)
+
+    def SetTextCtrlGrowable(*args, **kwargs):
+        """SetTextCtrlGrowable(self, bool grow=True)"""
+        return _controls_.PickerBase_SetTextCtrlGrowable(*args, **kwargs)
+
+    def IsPickerCtrlGrowable(*args, **kwargs):
+        """IsPickerCtrlGrowable(self) -> bool"""
+        return _controls_.PickerBase_IsPickerCtrlGrowable(*args, **kwargs)
+
+    def SetPickerCtrlGrowable(*args, **kwargs):
+        """SetPickerCtrlGrowable(self, bool grow=True)"""
+        return _controls_.PickerBase_SetPickerCtrlGrowable(*args, **kwargs)
+
+    def HasTextCtrl(*args, **kwargs):
+        """
+        HasTextCtrl(self) -> bool
+
+        Returns true if this class has a valid text control (i.e. if the
+        wx.PB_USE_TEXTCTRL style was given when creating this control).
+        """
+        return _controls_.PickerBase_HasTextCtrl(*args, **kwargs)
+
+    def GetTextCtrl(*args, **kwargs):
+        """
+        GetTextCtrl(self) -> TextCtrl
+
+        Returns a pointer to the text control handled by this class or None if
+        the wx.PB_USE_TEXTCTRL style was not specified when this control was
+        created.
+
+        Very important: the contents of the text control could be containing
+        an invalid representation of the entity which can be chosen through
+        the picker (e.g. the user entered an invalid colour syntax because of
+        a typo). Thus you should never parse the content of the textctrl to
+        get the user's input; rather use the derived-class getter
+        (e.g. `wx.ColourPickerCtrl.GetColour`, `wx.FilePickerCtrl.GetPath`,
+        etc).
+        """
+        return _controls_.PickerBase_GetTextCtrl(*args, **kwargs)
+
+    def GetPickerCtrl(*args, **kwargs):
+        """GetPickerCtrl(self) -> Control"""
+        return _controls_.PickerBase_GetPickerCtrl(*args, **kwargs)
+
+_controls_.PickerBase_swigregister(PickerBase)
+
+#---------------------------------------------------------------------------
+
+CLRP_SHOW_LABEL = _controls_.CLRP_SHOW_LABEL
+CLRP_USE_TEXTCTRL = _controls_.CLRP_USE_TEXTCTRL
+CLRP_DEFAULT_STYLE = _controls_.CLRP_DEFAULT_STYLE
+class ColourPickerCtrl(PickerBase):
+    """
+    This control allows the user to select a colour. The generic
+    implementation is a button which brings up a `wx.ColourDialog` when
+    clicked. Native implementations may differ but this is usually a
+    (small) widget which give access to the colour-chooser dialog.
+    """
+    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, Window parent, int id=-1, Colour col=*wxBLACK, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=CLRP_DEFAULT_STYLE, Validator validator=DefaultValidator, 
+            String name=ColourPickerCtrlNameStr) -> ColourPickerCtrl
+
+        This control allows the user to select a colour. The generic
+        implementation is a button which brings up a `wx.ColourDialog` when
+        clicked. Native implementations may differ but this is usually a
+        (small) widget which give access to the colour-chooser dialog.
+        """
+        _controls_.ColourPickerCtrl_swiginit(self,_controls_.new_ColourPickerCtrl(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id, Colour col=*wxBLACK, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=CLRP_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=ColourPickerCtrlNameStr) -> bool
+        """
+        return _controls_.ColourPickerCtrl_Create(*args, **kwargs)
+
+    def GetColour(*args, **kwargs):
+        """
+        GetColour(self) -> Colour
+
+        Returns the currently selected colour.
+        """
+        return _controls_.ColourPickerCtrl_GetColour(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """
+        SetColour(self, Colour col)
+
+        Set the displayed colour.
+        """
+        return _controls_.ColourPickerCtrl_SetColour(*args, **kwargs)
+
+_controls_.ColourPickerCtrl_swigregister(ColourPickerCtrl)
+ColourPickerCtrlNameStr = cvar.ColourPickerCtrlNameStr
+
+def PreColourPickerCtrl(*args, **kwargs):
+    """
+    PreColourPickerCtrl() -> ColourPickerCtrl
+
+    This control allows the user to select a colour. The generic
+    implementation is a button which brings up a `wx.ColourDialog` when
+    clicked. Native implementations may differ but this is usually a
+    (small) widget which give access to the colour-chooser dialog.
+    """
+    val = _controls_.new_PreColourPickerCtrl(*args, **kwargs)
+    return val
+
+wxEVT_COMMAND_COLOURPICKER_CHANGED = _controls_.wxEVT_COMMAND_COLOURPICKER_CHANGED
+EVT_COLOURPICKER_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_COLOURPICKER_CHANGED, 1 )
+
+class ColourPickerEvent(_core.CommandEvent):
+    """Proxy of C++ ColourPickerEvent 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, Object generator, int id, Colour col) -> ColourPickerEvent"""
+        _controls_.ColourPickerEvent_swiginit(self,_controls_.new_ColourPickerEvent(*args, **kwargs))
+    def GetColour(*args, **kwargs):
+        """GetColour(self) -> Colour"""
+        return _controls_.ColourPickerEvent_GetColour(*args, **kwargs)
+
+    def SetColour(*args, **kwargs):
+        """SetColour(self, Colour c)"""
+        return _controls_.ColourPickerEvent_SetColour(*args, **kwargs)
+
+_controls_.ColourPickerEvent_swigregister(ColourPickerEvent)
+
+#---------------------------------------------------------------------------
+
+FLP_OPEN = _controls_.FLP_OPEN
+FLP_SAVE = _controls_.FLP_SAVE
+FLP_OVERWRITE_PROMPT = _controls_.FLP_OVERWRITE_PROMPT
+FLP_FILE_MUST_EXIST = _controls_.FLP_FILE_MUST_EXIST
+FLP_CHANGE_DIR = _controls_.FLP_CHANGE_DIR
+DIRP_DIR_MUST_EXIST = _controls_.DIRP_DIR_MUST_EXIST
+DIRP_CHANGE_DIR = _controls_.DIRP_CHANGE_DIR
+FLP_USE_TEXTCTRL = _controls_.FLP_USE_TEXTCTRL
+FLP_DEFAULT_STYLE = _controls_.FLP_DEFAULT_STYLE
+DIRP_USE_TEXTCTRL = _controls_.DIRP_USE_TEXTCTRL
+DIRP_DEFAULT_STYLE = _controls_.DIRP_DEFAULT_STYLE
+class FilePickerCtrl(PickerBase):
+    """Proxy of C++ FilePickerCtrl 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, Window parent, int id=-1, String path=EmptyString, 
+            String message=FileSelectorPromptStr, String wildcard=FileSelectorDefaultWildcardStr, 
+            Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=FLP_DEFAULT_STYLE, Validator validator=DefaultValidator, 
+            String name=FilePickerCtrlNameStr) -> FilePickerCtrl
+        """
+        _controls_.FilePickerCtrl_swiginit(self,_controls_.new_FilePickerCtrl(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=-1, String path=EmptyString, 
+            String message=FileSelectorPromptStr, String wildcard=FileSelectorDefaultWildcardStr, 
+            Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=FLP_DEFAULT_STYLE, Validator validator=DefaultValidator, 
+            String name=FilePickerCtrlNameStr) -> bool
+        """
+        return _controls_.FilePickerCtrl_Create(*args, **kwargs)
+
+    def GetPath(*args, **kwargs):
+        """GetPath(self) -> String"""
+        return _controls_.FilePickerCtrl_GetPath(*args, **kwargs)
+
+    def SetPath(*args, **kwargs):
+        """SetPath(self, String str)"""
+        return _controls_.FilePickerCtrl_SetPath(*args, **kwargs)
+
+    def CheckPath(*args, **kwargs):
+        """CheckPath(self, String path) -> bool"""
+        return _controls_.FilePickerCtrl_CheckPath(*args, **kwargs)
+
+    def GetTextCtrlValue(*args, **kwargs):
+        """GetTextCtrlValue(self) -> String"""
+        return _controls_.FilePickerCtrl_GetTextCtrlValue(*args, **kwargs)
+
+_controls_.FilePickerCtrl_swigregister(FilePickerCtrl)
+FilePickerCtrlNameStr = cvar.FilePickerCtrlNameStr
+FileSelectorPromptStr = cvar.FileSelectorPromptStr
+DirPickerCtrlNameStr = cvar.DirPickerCtrlNameStr
+DirSelectorPromptStr = cvar.DirSelectorPromptStr
+FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
+
+def PreFilePickerCtrl(*args, **kwargs):
+    """PreFilePickerCtrl() -> FilePickerCtrl"""
+    val = _controls_.new_PreFilePickerCtrl(*args, **kwargs)
+    return val
+
+class DirPickerCtrl(PickerBase):
+    """Proxy of C++ DirPickerCtrl 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, Window parent, int id=-1, String path=EmptyString, 
+            String message=DirSelectorPromptStr, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DIRP_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=DirPickerCtrlNameStr) -> DirPickerCtrl
+        """
+        _controls_.DirPickerCtrl_swiginit(self,_controls_.new_DirPickerCtrl(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=-1, String path=EmptyString, 
+            String message=DirSelectorPromptStr, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=DIRP_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=DirPickerCtrlNameStr) -> bool
+        """
+        return _controls_.DirPickerCtrl_Create(*args, **kwargs)
+
+    def GetPath(*args, **kwargs):
+        """GetPath(self) -> String"""
+        return _controls_.DirPickerCtrl_GetPath(*args, **kwargs)
+
+    def SetPath(*args, **kwargs):
+        """SetPath(self, String str)"""
+        return _controls_.DirPickerCtrl_SetPath(*args, **kwargs)
+
+    def CheckPath(*args, **kwargs):
+        """CheckPath(self, String path) -> bool"""
+        return _controls_.DirPickerCtrl_CheckPath(*args, **kwargs)
+
+    def GetTextCtrlValue(*args, **kwargs):
+        """GetTextCtrlValue(self) -> String"""
+        return _controls_.DirPickerCtrl_GetTextCtrlValue(*args, **kwargs)
+
+_controls_.DirPickerCtrl_swigregister(DirPickerCtrl)
+
+def PreDirPickerCtrl(*args, **kwargs):
+    """PreDirPickerCtrl() -> DirPickerCtrl"""
+    val = _controls_.new_PreDirPickerCtrl(*args, **kwargs)
+    return val
+
+wxEVT_COMMAND_FILEPICKER_CHANGED = _controls_.wxEVT_COMMAND_FILEPICKER_CHANGED
+wxEVT_COMMAND_DIRPICKER_CHANGED = _controls_.wxEVT_COMMAND_DIRPICKER_CHANGED
+EVT_FILEPICKER_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_FILEPICKER_CHANGED, 1 )
+EVT_DIRPICKER_CHANGED  = wx.PyEventBinder( wxEVT_COMMAND_DIRPICKER_CHANGED,  1 )
+
+class FileDirPickerEvent(_core.CommandEvent):
+    """Proxy of C++ FileDirPickerEvent 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 type, Object generator, int id, String path) -> FileDirPickerEvent"""
+        _controls_.FileDirPickerEvent_swiginit(self,_controls_.new_FileDirPickerEvent(*args, **kwargs))
+    def GetPath(*args, **kwargs):
+        """GetPath(self) -> String"""
+        return _controls_.FileDirPickerEvent_GetPath(*args, **kwargs)
+
+    def SetPath(*args, **kwargs):
+        """SetPath(self, String p)"""
+        return _controls_.FileDirPickerEvent_SetPath(*args, **kwargs)
+
+_controls_.FileDirPickerEvent_swigregister(FileDirPickerEvent)
+
+#---------------------------------------------------------------------------
+
+FNTP_FONTDESC_AS_LABEL = _controls_.FNTP_FONTDESC_AS_LABEL
+FNTP_USEFONT_FOR_LABEL = _controls_.FNTP_USEFONT_FOR_LABEL
+FNTP_USE_TEXTCTRL = _controls_.FNTP_USE_TEXTCTRL
+FNTP_DEFAULT_STYLE = _controls_.FNTP_DEFAULT_STYLE
+class FontPickerCtrl(PickerBase):
+    """Proxy of C++ FontPickerCtrl 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, Window parent, int id=-1, Font initial=*wxNORMAL_FONT, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=FNTP_DEFAULT_STYLE, Validator validator=DefaultValidator, 
+            String name=FontPickerCtrlNameStr) -> FontPickerCtrl
+        """
+        _controls_.FontPickerCtrl_swiginit(self,_controls_.new_FontPickerCtrl(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=-1, Font initial=*wxNORMAL_FONT, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=FNTP_DEFAULT_STYLE, Validator validator=DefaultValidator, 
+            String name=FontPickerCtrlNameStr) -> bool
+        """
+        return _controls_.FontPickerCtrl_Create(*args, **kwargs)
+
+    def GetSelectedFont(*args, **kwargs):
+        """GetSelectedFont(self) -> Font"""
+        return _controls_.FontPickerCtrl_GetSelectedFont(*args, **kwargs)
+
+    def SetSelectedFont(*args, **kwargs):
+        """SetSelectedFont(self, Font f)"""
+        return _controls_.FontPickerCtrl_SetSelectedFont(*args, **kwargs)
+
+    def SetMaxPointSize(*args, **kwargs):
+        """SetMaxPointSize(self, unsigned int max)"""
+        return _controls_.FontPickerCtrl_SetMaxPointSize(*args, **kwargs)
+
+    def GetMaxPointSize(*args, **kwargs):
+        """GetMaxPointSize(self) -> unsigned int"""
+        return _controls_.FontPickerCtrl_GetMaxPointSize(*args, **kwargs)
+
+_controls_.FontPickerCtrl_swigregister(FontPickerCtrl)
+FontPickerCtrlNameStr = cvar.FontPickerCtrlNameStr
+
+def PreFontPickerCtrl(*args, **kwargs):
+    """PreFontPickerCtrl() -> FontPickerCtrl"""
+    val = _controls_.new_PreFontPickerCtrl(*args, **kwargs)
+    return val
+
+wxEVT_COMMAND_FONTPICKER_CHANGED = _controls_.wxEVT_COMMAND_FONTPICKER_CHANGED
+EVT_FONTPICKER_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_FONTPICKER_CHANGED, 1 )
+
+class FontPickerEvent(_core.CommandEvent):
+    """Proxy of C++ FontPickerEvent 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, Object generator, int id, Font f) -> FontPickerEvent"""
+        _controls_.FontPickerEvent_swiginit(self,_controls_.new_FontPickerEvent(*args, **kwargs))
+    def GetFont(*args, **kwargs):
+        """GetFont(self) -> Font"""
+        return _controls_.FontPickerEvent_GetFont(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(self, Font c)"""
+        return _controls_.FontPickerEvent_SetFont(*args, **kwargs)
+
+_controls_.FontPickerEvent_swigregister(FontPickerEvent)
+