check for ERROR_NO_MORE_FILES error code from FindFirstFile() as it's not really...

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

diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py
index fd68c24458d2f5a35581f7f1b99dc664dbf4070d..3f785b4716fa76f611e38d5908b64f6485ecf2b5 100644 (file)
--- a/wxPython/src/gtk/_controls.py
+++ b/wxPython/src/gtk/_controls.py
@@ -132,8 +132,7 @@ class Button(_core.Control):
         return _controls_.Button_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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
 
 cvar = _controls_.cvar
 ButtonNameStr = cvar.ButtonNameStr
 


@@ -298,8 +297,7 @@ class BitmapButton(Button):
         """GetMarginY(self) -> int"""
         return _controls_.BitmapButton_GetMarginY(*args, **kwargs)
 
         """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):
     """
 
 def PreBitmapButton(*args, **kwargs):
     """


@@ -436,8 +434,7 @@ class CheckBox(_core.Control):
         return _controls_.CheckBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 CheckBoxNameStr = cvar.CheckBoxNameStr
 
 def PreCheckBox(*args, **kwargs):


@@ -528,8 +525,7 @@ class Choice(_core.ControlWithItems):
         return _controls_.Choice_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 ChoiceNameStr = cvar.ChoiceNameStr
 
 def PreChoice(*args, **kwargs):


@@ -701,6 +697,14 @@ class ComboBox(_core.Control,_core.ItemContainer):
         """
         return _controls_.ComboBox_SetStringSelection(*args, **kwargs)
 
         """
         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)
     def SetEditable(*args, **kwargs):
         """SetEditable(self, bool editable)"""
         return _controls_.ComboBox_SetEditable(*args, **kwargs)


@@ -817,8 +821,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
         return _controls_.ComboBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 ComboBoxNameStr = cvar.ComboBoxNameStr
 
 def PreComboBox(*args, **kwargs):


@@ -852,7 +855,7 @@ def ComboBox_GetClassDefaultAttributes(*args, **kwargs):
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH
 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')
 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')


@@ -930,8 +933,7 @@ class Gauge(_core.Control):
         return _controls_.Gauge_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 GaugeNameStr = cvar.GaugeNameStr
 
 def PreGauge(*args, **kwargs):


@@ -997,8 +999,7 @@ class StaticBox(_core.Control):
         return _controls_.StaticBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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
 StaticBitmapNameStr = cvar.StaticBitmapNameStr
 StaticBoxNameStr = cvar.StaticBoxNameStr
 StaticTextNameStr = cvar.StaticTextNameStr


@@ -1075,8 +1076,7 @@ class StaticLine(_core.Control):
         return _controls_.StaticLine_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreStaticLine(*args, **kwargs):
     """PreStaticLine() -> StaticLine"""


@@ -1156,8 +1156,7 @@ class StaticText(_core.Control):
         return _controls_.StaticText_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreStaticText(*args, **kwargs):
     """PreStaticText() -> StaticText"""


@@ -1234,8 +1233,7 @@ class StaticBitmap(_core.Control):
         return _controls_.StaticBitmap_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreStaticBitmap(*args, **kwargs):
     """PreStaticBitmap() -> StaticBitmap"""


@@ -1294,7 +1292,7 @@ class ListBox(_core.ControlWithItems):
         return _controls_.ListBox_Insert(*args, **kwargs)
 
     def InsertItems(*args, **kwargs):
         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):
         return _controls_.ListBox_InsertItems(*args, **kwargs)
 
     def Set(*args, **kwargs):


@@ -1392,8 +1390,7 @@ class ListBox(_core.ControlWithItems):
         return _controls_.ListBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 ListBoxNameStr = cvar.ListBoxNameStr
 
 def PreListBox(*args, **kwargs):


@@ -1444,19 +1441,18 @@ class CheckListBox(ListBox):
         return _controls_.CheckListBox_Create(*args, **kwargs)
 
     def IsChecked(*args, **kwargs):
         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):
         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)
 
     def GetItemHeight(*args, **kwargs):
         """GetItemHeight(self) -> int"""
         return _controls_.CheckListBox_GetItemHeight(*args, **kwargs)
 
         return _controls_.CheckListBox_Check(*args, **kwargs)
 
     def GetItemHeight(*args, **kwargs):
         """GetItemHeight(self) -> int"""
         return _controls_.CheckListBox_GetItemHeight(*args, **kwargs)
 

-CheckListBox_swigregister = _controls_.CheckListBox_swigregister
-CheckListBox_swigregister(CheckListBox)
+_controls_.CheckListBox_swigregister(CheckListBox)

 
 def PreCheckListBox(*args, **kwargs):
     """PreCheckListBox() -> CheckListBox"""
 
 def PreCheckListBox(*args, **kwargs):
     """PreCheckListBox() -> CheckListBox"""


@@ -1483,9 +1479,9 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP
 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_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
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE


@@ -1527,6 +1523,11 @@ class TextAttr(object):
         """Init(self)"""
         return _controls_.TextAttr_Init(*args, **kwargs)
 
         """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)
     def SetTextColour(*args, **kwargs):
         """SetTextColour(self, Colour colText)"""
         return _controls_.TextAttr_SetTextColour(*args, **kwargs)


@@ -1636,10 +1637,13 @@ class TextAttr(object):
         return _controls_.TextAttr_Combine(*args, **kwargs)
 
     Combine = staticmethod(Combine)
         return _controls_.TextAttr_Combine(*args, **kwargs)
 
     Combine = staticmethod(Combine)

-TextAttr_swigregister = _controls_.TextAttr_swigregister
-TextAttr_swigregister(TextAttr)
+_controls_.TextAttr_swigregister(TextAttr)

 TextCtrlNameStr = cvar.TextCtrlNameStr
 
 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)
 def TextAttr_Combine(*args, **kwargs):
   """TextAttr_Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
   return _controls_.TextAttr_Combine(*args, **kwargs)


@@ -1905,8 +1909,7 @@ class TextCtrl(_core.Control):
         return _controls_.TextCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreTextCtrl(*args, **kwargs):
     """PreTextCtrl() -> TextCtrl"""


@@ -1953,8 +1956,7 @@ class TextUrlEvent(_core.CommandEvent):
         """GetURLEnd(self) -> long"""
         return _controls_.TextUrlEvent_GetURLEnd(*args, **kwargs)
 
         """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)
 
 EVT_TEXT        = wx.PyEventBinder( wxEVT_COMMAND_TEXT_UPDATED, 1)
 EVT_TEXT_ENTER  = wx.PyEventBinder( wxEVT_COMMAND_TEXT_ENTER, 1)


@@ -2029,8 +2031,7 @@ class ScrollBar(_core.Control):
         return _controls_.ScrollBar_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 ScrollBarNameStr = cvar.ScrollBarNameStr
 
 def PreScrollBar(*args, **kwargs):


@@ -2132,8 +2133,7 @@ class SpinButton(_core.Control):
         return _controls_.SpinButton_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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
 
 SPIN_BUTTON_NAME = cvar.SPIN_BUTTON_NAME
 SpinCtrlNameStr = cvar.SpinCtrlNameStr
 


@@ -2228,8 +2228,7 @@ class SpinCtrl(_core.Control):
         return _controls_.SpinCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreSpinCtrl(*args, **kwargs):
     """PreSpinCtrl() -> SpinCtrl"""


@@ -2258,7 +2257,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): 
     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"""
         _controls_.SpinEvent_swiginit(self,_controls_.new_SpinEvent(*args, **kwargs))
     def GetPosition(*args, **kwargs):
         """GetPosition(self) -> int"""


@@ -2268,8 +2267,7 @@ class SpinEvent(_core.NotifyEvent):
         """SetPosition(self, int pos)"""
         return _controls_.SpinEvent_SetPosition(*args, **kwargs)
 
         """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)
 
 wxEVT_COMMAND_SPINCTRL_UPDATED = _controls_.wxEVT_COMMAND_SPINCTRL_UPDATED
 EVT_SPIN_UP   = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1)


@@ -2342,25 +2340,41 @@ class RadioBox(_core.Control):
     GetItemLabel = GetString 
     SetItemLabel = SetString 
     def EnableItem(*args, **kwargs):
     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):
         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)
 
         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):
     def GetColumnCount(*args, **kwargs):

-        """GetColumnCount(self) -> int"""
+        """GetColumnCount(self) -> unsigned int"""

         return _controls_.RadioBox_GetColumnCount(*args, **kwargs)
 
     def GetRowCount(*args, **kwargs):
         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)
 
         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 GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -2379,8 +2393,7 @@ class RadioBox(_core.Control):
         return _controls_.RadioBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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
 
 RadioBoxNameStr = cvar.RadioBoxNameStr
 RadioButtonNameStr = cvar.RadioButtonNameStr
 


@@ -2457,8 +2470,7 @@ class RadioButton(_core.Control):
         return _controls_.RadioButton_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreRadioButton(*args, **kwargs):
     """PreRadioButton() -> RadioButton"""


@@ -2624,8 +2636,7 @@ class Slider(_core.Control):
         return _controls_.Slider_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 SliderNameStr = cvar.SliderNameStr
 
 def PreSlider(*args, **kwargs):


@@ -2704,8 +2715,7 @@ class ToggleButton(_core.Control):
         return _controls_.ToggleButton_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 ToggleButtonNameStr = cvar.ToggleButtonNameStr
 
 def PreToggleButton(*args, **kwargs):


@@ -2738,6 +2748,7 @@ BK_BOTTOM = _controls_.BK_BOTTOM
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK

+BK_BUTTONBAR = _controls_.BK_BUTTONBAR

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


@@ -2796,17 +2807,25 @@ class BookCtrlBase(_core.Control):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):

-        """GetInternalBorder(self) -> size_t"""
+        """GetInternalBorder(self) -> unsigned int"""

         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):

-        """SetInternalBorder(self, size_t internalBorder)"""
+        """SetInternalBorder(self, unsigned int internalBorder)"""

         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 
         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """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)
     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)


@@ -2815,6 +2834,10 @@ class BookCtrlBase(_core.Control):
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 
         """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)
     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)


@@ -2864,8 +2887,7 @@ class BookCtrlBase(_core.Control):
         return _controls_.BookCtrlBase_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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):
 NotebookNameStr = cvar.NotebookNameStr
 
 def BookCtrlBase_GetClassDefaultAttributes(*args, **kwargs):


@@ -2891,7 +2913,7 @@ class BookCtrlBaseEvent(_core.NotifyEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __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))
             int nOldSel=-1) -> BookCtrlBaseEvent
         """
         _controls_.BookCtrlBaseEvent_swiginit(self,_controls_.new_BookCtrlBaseEvent(*args, **kwargs))


@@ -2916,8 +2938,7 @@ class BookCtrlBaseEvent(_core.NotifyEvent):
         """SetOldSelection(self, int nOldSel)"""
         return _controls_.BookCtrlBaseEvent_SetOldSelection(*args, **kwargs)
 
         """SetOldSelection(self, int nOldSel)"""
         return _controls_.BookCtrlBaseEvent_SetOldSelection(*args, **kwargs)
 

-BookCtrlBaseEvent_swigregister = _controls_.BookCtrlBaseEvent_swigregister
-BookCtrlBaseEvent_swigregister(BookCtrlBaseEvent)
+_controls_.BookCtrlBaseEvent_swigregister(BookCtrlBaseEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -2994,8 +3015,7 @@ class Notebook(BookCtrlBase):
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreNotebook(*args, **kwargs):
     """PreNotebook() -> Notebook"""


@@ -3025,12 +3045,11 @@ class NotebookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __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))
             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
 
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING


@@ -3099,8 +3118,7 @@ class Listbook(BookCtrlBase):
         """GetListView(self) -> ListView"""
         return _controls_.Listbook_GetListView(*args, **kwargs)
 
         """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"""
 
 def PreListbook(*args, **kwargs):
     """PreListbook() -> Listbook"""


@@ -3113,12 +3131,11 @@ class ListbookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __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))
             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
 
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING


@@ -3154,8 +3171,7 @@ class Choicebook(BookCtrlBase):
         """GetChoiceCtrl(self) -> Choice"""
         return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs)
 
         """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"""
 
 def PreChoicebook(*args, **kwargs):
     """PreChoicebook() -> Choicebook"""


@@ -3168,12 +3184,11 @@ class ChoicebookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __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))
             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
 
 wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING


@@ -3234,8 +3249,7 @@ class Treebook(BookCtrlBase):
         """GetTreeCtrl(self) -> wxTreeCtrl"""
         return _controls_.Treebook_GetTreeCtrl(*args, **kwargs)
 
         """GetTreeCtrl(self) -> wxTreeCtrl"""
         return _controls_.Treebook_GetTreeCtrl(*args, **kwargs)
 

-Treebook_swigregister = _controls_.Treebook_swigregister
-Treebook_swigregister(Treebook)
+_controls_.Treebook_swigregister(Treebook)

 
 def PreTreebook(*args, **kwargs):
     """PreTreebook() -> Treebook"""
 
 def PreTreebook(*args, **kwargs):
     """PreTreebook() -> Treebook"""


@@ -3248,12 +3262,11 @@ class TreebookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __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))
             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
 
 wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING


@@ -3294,8 +3307,7 @@ class Toolbook(BookCtrlBase):
         """Realize(self)"""
         return _controls_.Toolbook_Realize(*args, **kwargs)
 
         """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"""
 
 def PreToolbook(*args, **kwargs):
     """PreToolbook() -> Toolbook"""


@@ -3308,12 +3320,11 @@ class ToolbookEvent(BookCtrlBaseEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __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))
             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
 
 wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED
 wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING


@@ -3462,8 +3473,7 @@ class ToolBarToolBase(_core.Object):
     SetBitmap1 = SetNormalBitmap
     SetBitmap2 = SetDisabledBitmap
 
     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"""
 
 class ToolBarBase(_core.Control):
     """Proxy of C++ ToolBarBase class"""


@@ -3784,8 +3794,7 @@ class ToolBarBase(_core.Control):
         """GetToolsCount(self) -> size_t"""
         return _controls_.ToolBarBase_GetToolsCount(*args, **kwargs)
 
         """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"""
 
 class ToolBar(ToolBarBase):
     """Proxy of C++ ToolBar class"""


@@ -3808,10 +3817,6 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
         """
         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
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -3830,8 +3835,7 @@ class ToolBar(ToolBarBase):
         return _controls_.ToolBar_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreToolBar(*args, **kwargs):
     """PreToolBar() -> ToolBar"""


@@ -3985,8 +3989,7 @@ class ListItemAttr(object):
         args[0].thisown = 0
         return val
 
         args[0].thisown = 0
         return val
 

-ListItemAttr_swigregister = _controls_.ListItemAttr_swigregister
-ListItemAttr_swigregister(ListItemAttr)
+_controls_.ListItemAttr_swigregister(ListItemAttr)

 ListCtrlNameStr = cvar.ListCtrlNameStr
 
 #---------------------------------------------------------------------------
 ListCtrlNameStr = cvar.ListCtrlNameStr
 
 #---------------------------------------------------------------------------


@@ -4126,8 +4129,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)
     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)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4136,7 +4138,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): 
     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)
         _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)


@@ -4202,8 +4204,7 @@ class ListEvent(_core.NotifyEvent):
         """SetEditCanceled(self, bool editCancelled)"""
         return _controls_.ListEvent_SetEditCanceled(*args, **kwargs)
 
         """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
 
 wxEVT_COMMAND_LIST_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_BEGIN_DRAG
 wxEVT_COMMAND_LIST_BEGIN_RDRAG = _controls_.wxEVT_COMMAND_LIST_BEGIN_RDRAG


@@ -4383,10 +4384,12 @@ class ListCtrl(_core.Control):
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 
         """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)
 
     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)
     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)


@@ -4637,8 +4640,7 @@ class ListCtrl(_core.Control):
         return _controls_.ListCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreListCtrl(*args, **kwargs):
     """PreListCtrl() -> ListCtrl"""


@@ -4719,8 +4721,7 @@ class ListView(ListCtrl):
         """ClearColumnImage(self, int col)"""
         return _controls_.ListView_ClearColumnImage(*args, **kwargs)
 
         """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"""
 
 def PreListView(*args, **kwargs):
     """PreListView() -> ListView"""


@@ -4743,8 +4744,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_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
 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded


@@ -4790,8 +4793,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() 
     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):
 TreeCtrlNameStr = cvar.TreeCtrlNameStr
 
 class TreeItemData(object):


@@ -4825,8 +4827,7 @@ class TreeItemData(object):
         args[0].thisown = 0
         return val
 
         args[0].thisown = 0
         return val
 

-TreeItemData_swigregister = _controls_.TreeItemData_swigregister
-TreeItemData_swigregister(TreeItemData)
+_controls_.TreeItemData_swigregister(TreeItemData)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4871,14 +4872,14 @@ 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_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): 
 
 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"""
+        """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent"""

         _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args, **kwargs))
     def GetItem(*args, **kwargs):
         """GetItem(self) -> TreeItemId"""
         _controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args, **kwargs))
     def GetItem(*args, **kwargs):
         """GetItem(self) -> TreeItemId"""


@@ -4940,8 +4941,7 @@ class TreeEvent(_core.NotifyEvent):
         """GetToolTip(self) -> String"""
         return _controls_.TreeEvent_GetToolTip(*args, **kwargs)
 
         """GetToolTip(self) -> String"""
         return _controls_.TreeEvent_GetToolTip(*args, **kwargs)
 

-TreeEvent_swigregister = _controls_.TreeEvent_swigregister
-TreeEvent_swigregister(TreeEvent)
+_controls_.TreeEvent_swigregister(TreeEvent)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -4975,7 +4975,7 @@ class TreeCtrl(_core.Control):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
         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):
         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):


@@ -5293,8 +5293,15 @@ class TreeCtrl(_core.Control):
         return _controls_.TreeCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         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"""
 
 def PreTreeCtrl(*args, **kwargs):
     """PreTreeCtrl() -> TreeCtrl"""


@@ -5430,8 +5437,7 @@ class GenericDirCtrl(_core.Control):
         """ReCreateTree(self)"""
         return _controls_.GenericDirCtrl_ReCreateTree(*args, **kwargs)
 
         """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):
 DirDialogDefaultFolderStr = cvar.DirDialogDefaultFolderStr
 
 def PreGenericDirCtrl(*args, **kwargs):


@@ -5462,8 +5468,7 @@ class DirFilterListCtrl(Choice):
         """FillFilterList(self, String filter, int defaultFilter)"""
         return _controls_.DirFilterListCtrl_FillFilterList(*args, **kwargs)
 
         """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"""
 
 def PreDirFilterListCtrl(*args, **kwargs):
     """PreDirFilterListCtrl() -> DirFilterListCtrl"""


@@ -5646,8 +5651,7 @@ class PyControl(_core.Control):
     base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
                                    "Please use PyScrolledWindow.OnInternalIdle instead.")
 
     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"""
 
 def PrePyControl(*args, **kwargs):
     """PrePyControl() -> PyControl"""


@@ -5686,7 +5690,7 @@ 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
     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, wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
+        """__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""

         _controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
     def GetPosition(*args, **kwargs):
         """
         _controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
     def GetPosition(*args, **kwargs):
         """


@@ -5738,8 +5742,7 @@ class HelpEvent(_core.CommandEvent):
         """
         return _controls_.HelpEvent_SetTarget(*args, **kwargs)
 
         """
         return _controls_.HelpEvent_SetTarget(*args, **kwargs)
 

-HelpEvent_swigregister = _controls_.HelpEvent_swigregister
-HelpEvent_swigregister(HelpEvent)
+_controls_.HelpEvent_swigregister(HelpEvent)

 
 class ContextHelp(_core.Object):
     """
 
 class ContextHelp(_core.Object):
     """


@@ -5802,8 +5805,7 @@ class ContextHelp(_core.Object):
         """
         return _controls_.ContextHelp_EndContextHelp(*args, **kwargs)
 
         """
         return _controls_.ContextHelp_EndContextHelp(*args, **kwargs)
 

-ContextHelp_swigregister = _controls_.ContextHelp_swigregister
-ContextHelp_swigregister(ContextHelp)
+_controls_.ContextHelp_swigregister(ContextHelp)

 
 class ContextHelpButton(BitmapButton):
     """
 
 class ContextHelpButton(BitmapButton):
     """


@@ -5832,8 +5834,7 @@ class ContextHelpButton(BitmapButton):
         _controls_.ContextHelpButton_swiginit(self,_controls_.new_ContextHelpButton(*args, **kwargs))
         self._setOORInfo(self)
 
         _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):
     """
 
 class HelpProvider(object):
     """


@@ -5847,6 +5848,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
     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
     def Set(*args, **kwargs):
         """
         Set(HelpProvider helpProvider) -> HelpProvider


@@ -5922,8 +5925,7 @@ class HelpProvider(object):
         args[0].thisown = 0
         return val
 
         args[0].thisown = 0
         return val
 

-HelpProvider_swigregister = _controls_.HelpProvider_swigregister
-HelpProvider_swigregister(HelpProvider)
+_controls_.HelpProvider_swigregister(HelpProvider)

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


@@ -5960,8 +5962,7 @@ class SimpleHelpProvider(HelpProvider):
         with the control (if any) in a tooltip.
         """
         _controls_.SimpleHelpProvider_swiginit(self,_controls_.new_SimpleHelpProvider(*args, **kwargs))
         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)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -6021,8 +6022,7 @@ class DragImage(_core.Object):
         """RedrawImage(self, Point oldPos, Point newPos, bool eraseOld, bool drawNew) -> bool"""
         return _controls_.DragImage_RedrawImage(*args, **kwargs)
 
         """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"""
 
 def DragIcon(*args, **kwargs):
     """DragIcon(Icon image, Cursor cursor=wxNullCursor) -> DragImage"""


@@ -6142,8 +6142,7 @@ class DatePickerCtrl(_core.Control):
         """
         return _controls_.DatePickerCtrl_GetUpperLimit(*args, **kwargs)
 
         """
         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):
 DatePickerCtrlNameStr = cvar.DatePickerCtrlNameStr
 
 def PreDatePickerCtrl(*args, **kwargs):