# 17/03/2004 - Joerg "Adi" Sieker adi@sieker.info

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

diff --git a/wxPython/src/gtk/controls.py b/wxPython/src/gtk/controls.py
index bc571f4decb251a4c5358ffc2ecdf00f58da7817..e0b7ccca883c23c876ddbddd0364379328448957 100644 (file)
--- a/wxPython/src/gtk/controls.py
+++ b/wxPython/src/gtk/controls.py
@@ -14,17 +14,50 @@ BU_BOTTOM = _controls.BU_BOTTOM
 BU_EXACTFIT = _controls.BU_EXACTFIT
 BU_AUTODRAW = _controls.BU_AUTODRAW
 class Button(core.Control):
 BU_EXACTFIT = _controls.BU_EXACTFIT
 BU_AUTODRAW = _controls.BU_AUTODRAW
 class Button(core.Control):

+    """
+    A button is a control that contains a text string, and is one of the most
+    common elements of a GUI.  It may be placed on a dialog box or panel, or
+    indeed almost any other window.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=ButtonNameStr) -> Button
+
+        Create and show a button.
+        """

         newobj = _controls.new_Button(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_Button(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.Button_Create(*args, **kwargs)
-    def SetDefault(*args, **kwargs): return _controls.Button_SetDefault(*args, **kwargs)
-    GetDefaultSize = staticmethod(_controls.Button_GetDefaultSize)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=ButtonNameStr) -> bool
+
+        Acutally create the GUI Button for 2-phase creation.
+        """
+        return _controls.Button_Create(*args, **kwargs)
+
+    def SetDefault(*args, **kwargs):
+        """
+        SetDefault()
+
+        This sets the button to be the default item for the panel or dialog box.
+        """
+        return _controls.Button_SetDefault(*args, **kwargs)
+
+    def GetDefaultSize(*args, **kwargs):
+        """GetDefaultSize() -> Size"""
+        return _controls.Button_GetDefaultSize(*args, **kwargs)
+
+    GetDefaultSize = staticmethod(GetDefaultSize)

 
 class ButtonPtr(Button):
     def __init__(self, this):
 
 class ButtonPtr(Button):
     def __init__(self, this):


@@ -32,35 +65,136 @@ class ButtonPtr(Button):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Button
 _controls.Button_swigregister(ButtonPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Button
 _controls.Button_swigregister(ButtonPtr)

+cvar = _controls.cvar
+ButtonNameStr = cvar.ButtonNameStr

 
 def PreButton(*args, **kwargs):
 
 def PreButton(*args, **kwargs):

+    """
+    PreButton() -> Button
+
+    Precreate a Button for 2-phase creation.
+    """

     val = _controls.new_PreButton(*args, **kwargs)
     val.thisown = 1
     return val
 
     val = _controls.new_PreButton(*args, **kwargs)
     val.thisown = 1
     return val
 

-Button_GetDefaultSize = _controls.Button_GetDefaultSize
+def Button_GetDefaultSize(*args, **kwargs):
+    """Button_GetDefaultSize() -> Size"""
+    return _controls.Button_GetDefaultSize(*args, **kwargs)

 
 class BitmapButton(Button):
 
 class BitmapButton(Button):

+    """
+    A Button that contains a bitmap.  A bitmap button can be supplied with a
+    single bitmap, and wxWindows will draw all button states using this bitmap. If
+    the application needs more control, additional bitmaps for the selected state,
+    unpressed focused state, and greyed-out state may be supplied.
+
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=BU_AUTODRAW, 
+            Validator validator=DefaultValidator, 
+            String name=ButtonNameStr) -> BitmapButton
+
+        Create and show a button with a bitmap for the label.
+        """

         newobj = _controls.new_BitmapButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_BitmapButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.BitmapButton_Create(*args, **kwargs)
-    def GetBitmapLabel(*args, **kwargs): return _controls.BitmapButton_GetBitmapLabel(*args, **kwargs)
-    def GetBitmapDisabled(*args, **kwargs): return _controls.BitmapButton_GetBitmapDisabled(*args, **kwargs)
-    def GetBitmapFocus(*args, **kwargs): return _controls.BitmapButton_GetBitmapFocus(*args, **kwargs)
-    def GetBitmapSelected(*args, **kwargs): return _controls.BitmapButton_GetBitmapSelected(*args, **kwargs)
-    def SetBitmapDisabled(*args, **kwargs): return _controls.BitmapButton_SetBitmapDisabled(*args, **kwargs)
-    def SetBitmapFocus(*args, **kwargs): return _controls.BitmapButton_SetBitmapFocus(*args, **kwargs)
-    def SetBitmapSelected(*args, **kwargs): return _controls.BitmapButton_SetBitmapSelected(*args, **kwargs)
-    def SetBitmapLabel(*args, **kwargs): return _controls.BitmapButton_SetBitmapLabel(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _controls.BitmapButton_SetMargins(*args, **kwargs)
-    def GetMarginX(*args, **kwargs): return _controls.BitmapButton_GetMarginX(*args, **kwargs)
-    def GetMarginY(*args, **kwargs): return _controls.BitmapButton_GetMarginY(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=BU_AUTODRAW, 
+            Validator validator=DefaultValidator, 
+            String name=ButtonNameStr) -> bool
+
+        Acutally create the GUI BitmapButton for 2-phase creation.
+        """
+        return _controls.BitmapButton_Create(*args, **kwargs)
+
+    def GetBitmapLabel(*args, **kwargs):
+        """
+        GetBitmapLabel() -> Bitmap
+
+        Returns the label bitmap (the one passed to the constructor).
+        """
+        return _controls.BitmapButton_GetBitmapLabel(*args, **kwargs)
+
+    def GetBitmapDisabled(*args, **kwargs):
+        """
+        GetBitmapDisabled() -> Bitmap
+
+        Returns the bitmap for the disabled state.
+        """
+        return _controls.BitmapButton_GetBitmapDisabled(*args, **kwargs)
+
+    def GetBitmapFocus(*args, **kwargs):
+        """
+        GetBitmapFocus() -> Bitmap
+
+        Returns the bitmap for the focused state.
+        """
+        return _controls.BitmapButton_GetBitmapFocus(*args, **kwargs)
+
+    def GetBitmapSelected(*args, **kwargs):
+        """
+        GetBitmapSelected() -> Bitmap
+
+        Returns the bitmap for the selected state.
+        """
+        return _controls.BitmapButton_GetBitmapSelected(*args, **kwargs)
+
+    def SetBitmapDisabled(*args, **kwargs):
+        """
+        SetBitmapDisabled(Bitmap bitmap)
+
+        Sets the bitmap for the disabled button appearance.
+        """
+        return _controls.BitmapButton_SetBitmapDisabled(*args, **kwargs)
+
+    def SetBitmapFocus(*args, **kwargs):
+        """
+        SetBitmapFocus(Bitmap bitmap)
+
+        Sets the bitmap for the button appearance when it has the keyboard focus.
+        """
+        return _controls.BitmapButton_SetBitmapFocus(*args, **kwargs)
+
+    def SetBitmapSelected(*args, **kwargs):
+        """
+        SetBitmapSelected(Bitmap bitmap)
+
+        Sets the bitmap for the selected (depressed) button appearance.
+        """
+        return _controls.BitmapButton_SetBitmapSelected(*args, **kwargs)
+
+    def SetBitmapLabel(*args, **kwargs):
+        """
+        SetBitmapLabel(Bitmap bitmap)
+
+        Sets the bitmap label for the button.  This is the bitmap used for the
+        unselected state, and for all other states if no other bitmaps are provided.
+        """
+        return _controls.BitmapButton_SetBitmapLabel(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(int x, int y)"""
+        return _controls.BitmapButton_SetMargins(*args, **kwargs)
+
+    def GetMarginX(*args, **kwargs):
+        """GetMarginX() -> int"""
+        return _controls.BitmapButton_GetMarginX(*args, **kwargs)
+
+    def GetMarginY(*args, **kwargs):
+        """GetMarginY() -> int"""
+        return _controls.BitmapButton_GetMarginY(*args, **kwargs)
+

 
 class BitmapButtonPtr(BitmapButton):
     def __init__(self, this):
 
 class BitmapButtonPtr(BitmapButton):
     def __init__(self, this):


@@ -70,6 +204,11 @@ class BitmapButtonPtr(BitmapButton):
 _controls.BitmapButton_swigregister(BitmapButtonPtr)
 
 def PreBitmapButton(*args, **kwargs):
 _controls.BitmapButton_swigregister(BitmapButtonPtr)
 
 def PreBitmapButton(*args, **kwargs):

+    """
+    PreBitmapButton() -> BitmapButton
+
+    Precreate a BitmapButton for 2-phase creation.
+    """

     val = _controls.new_PreBitmapButton(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreBitmapButton(*args, **kwargs)
     val.thisown = 1
     return val


@@ -83,22 +222,102 @@ CHK_UNCHECKED = _controls.CHK_UNCHECKED
 CHK_CHECKED = _controls.CHK_CHECKED
 CHK_UNDETERMINED = _controls.CHK_UNDETERMINED
 class CheckBox(core.Control):
 CHK_CHECKED = _controls.CHK_CHECKED
 CHK_UNDETERMINED = _controls.CHK_UNDETERMINED
 class CheckBox(core.Control):

+    """
+    A checkbox is a labelled box which by default is either on (checkmark is
+    visible) or off (no checkmark). Optionally (When the wxCHK_3STATE style flag
+    is set) it can have a third state, called the mixed or undetermined
+    state. Often this is used as a "Does Not Apply" state.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=CheckBoxNameStr) -> CheckBox
+
+        Creates and shows a CheckBox control
+        """

         newobj = _controls.new_CheckBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_CheckBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.CheckBox_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.CheckBox_GetValue(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _controls.CheckBox_IsChecked(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.CheckBox_SetValue(*args, **kwargs)
-    def Get3StateValue(*args, **kwargs): return _controls.CheckBox_Get3StateValue(*args, **kwargs)
-    def Set3StateValue(*args, **kwargs): return _controls.CheckBox_Set3StateValue(*args, **kwargs)
-    def Is3State(*args, **kwargs): return _controls.CheckBox_Is3State(*args, **kwargs)
-    def Is3rdStateAllowedForUser(*args, **kwargs): return _controls.CheckBox_Is3rdStateAllowedForUser(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=CheckBoxNameStr) -> bool
+
+        Actually create the GUI CheckBox for 2-phase creation.
+        """
+        return _controls.CheckBox_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """
+        GetValue() -> bool
+
+        Gets the state of a 2-state CheckBox.  Returns True if it is checked,
+        False otherwise.
+        """
+        return _controls.CheckBox_GetValue(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """
+        IsChecked() -> bool
+
+        Similar to GetValue, but raises an exception if it is not a 2-state CheckBox.
+        """
+        return _controls.CheckBox_IsChecked(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """
+        SetValue(bool state)
+
+        Set the state of a 2-state CheckBox.  Pass True for checked,
+        False for unchecked.
+        """
+        return _controls.CheckBox_SetValue(*args, **kwargs)
+
+    def Get3StateValue(*args, **kwargs):
+        """
+        Get3StateValue() -> int
+
+        Returns wx.CHK_UNCHECKED when the CheckBox is unchecked, wx.CHK_CHECKED when
+        it is checked and wx.CHK_UNDETERMINED when it's in the undetermined state.
+        Raises an exceptiion when the function is used with a 2-state CheckBox.
+        """
+        return _controls.CheckBox_Get3StateValue(*args, **kwargs)
+
+    def Set3StateValue(*args, **kwargs):
+        """
+        Set3StateValue(int state)
+
+        Sets the CheckBox to the given state.  The state parameter can be
+        one of the following: wx.CHK_UNCHECKED (Check is off), wx.CHK_CHECKED
+        (Check is on) or wx.CHK_UNDETERMINED (Check is mixed). Raises an
+        exception  when the CheckBox is a 2-state checkbox and setting the state
+        to wx.CHK_UNDETERMINED.
+        """
+        return _controls.CheckBox_Set3StateValue(*args, **kwargs)
+
+    def Is3State(*args, **kwargs):
+        """
+        Is3State() -> bool
+
+        Returns whether or not the CheckBox is a 3-state CheckBox.
+        """
+        return _controls.CheckBox_Is3State(*args, **kwargs)
+
+    def Is3rdStateAllowedForUser(*args, **kwargs):
+        """
+        Is3rdStateAllowedForUser() -> bool
+
+        Returns whether or not the user can set the CheckBox to the third state.
+        """
+        return _controls.CheckBox_Is3rdStateAllowedForUser(*args, **kwargs)
+

 
 class CheckBoxPtr(CheckBox):
     def __init__(self, this):
 
 class CheckBoxPtr(CheckBox):
     def __init__(self, this):


@@ -106,8 +325,14 @@ class CheckBoxPtr(CheckBox):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = CheckBox
 _controls.CheckBox_swigregister(CheckBoxPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = CheckBox
 _controls.CheckBox_swigregister(CheckBoxPtr)

+CheckBoxNameStr = cvar.CheckBoxNameStr

 
 def PreCheckBox(*args, **kwargs):
 
 def PreCheckBox(*args, **kwargs):

+    """
+    PreCheckBox() -> CheckBox
+
+    Precreate a CheckBox for 2-phase creation.
+    """

     val = _controls.new_PreCheckBox(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreCheckBox(*args, **kwargs)
     val.thisown = 1
     return val


@@ -115,20 +340,61 @@ def PreCheckBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class Choice(core.ControlWithItems):
 #---------------------------------------------------------------------------
 
 class Choice(core.ControlWithItems):

+    """
+    A Choice control is used to select one of a list of strings. Unlike a ListBox,
+    only the selection is visible until the user pulls down the menu of choices.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxChoice instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
+            List choices=[], long style=0, Validator validator=DefaultValidator,
+            String name=ChoiceNameStr) -> Choice
+
+        Create and show a Choice control
+        """

         newobj = _controls.new_Choice(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_Choice(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.Choice_Create(*args, **kwargs)
-    def GetColumns(*args, **kwargs): return _controls.Choice_GetColumns(*args, **kwargs)
-    def SetColumns(*args, **kwargs): return _controls.Choice_SetColumns(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.Choice_SetSelection(*args, **kwargs)
-    def SetStringSelection(*args, **kwargs): return _controls.Choice_SetStringSelection(*args, **kwargs)
-    def SetString(*args, **kwargs): return _controls.Choice_SetString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxChoice instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
+            List choices=[], long style=0, Validator validator=DefaultValidator,
+            String name=ChoiceNameStr) -> bool
+
+        Actually create the GUI Choice control for 2-phase creation
+        """
+        return _controls.Choice_Create(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """
+        SetSelection(int n)
+
+        Select the n'th item (zero based) in the list.
+        """
+        return _controls.Choice_SetSelection(*args, **kwargs)
+
+    def SetStringSelection(*args, **kwargs):
+        """
+        SetStringSelection(String string)
+
+        Select the item with the specifed string
+        """
+        return _controls.Choice_SetStringSelection(*args, **kwargs)
+
+    def SetString(*args, **kwargs):
+        """
+        SetString(int n, String string)
+
+        Set the label for the n'th item (zero based) in the list.
+        """
+        return _controls.Choice_SetString(*args, **kwargs)
+
+    Select = SetSelection 

 
 class ChoicePtr(Choice):
     def __init__(self, this):
 
 class ChoicePtr(Choice):
     def __init__(self, this):


@@ -136,8 +402,14 @@ class ChoicePtr(Choice):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Choice
 _controls.Choice_swigregister(ChoicePtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Choice
 _controls.Choice_swigregister(ChoicePtr)

+ChoiceNameStr = cvar.ChoiceNameStr

 
 def PreChoice(*args, **kwargs):
 
 def PreChoice(*args, **kwargs):

+    """
+    PreChoice() -> Choice
+
+    Precreate a Choice control for 2-phase creation.
+    """

     val = _controls.new_PreChoice(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreChoice(*args, **kwargs)
     val.thisown = 1
     return val


@@ -145,28 +417,140 @@ def PreChoice(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ComboBox(core.Control,core.ItemContainer):
 #---------------------------------------------------------------------------
 
 class ComboBox(core.Control,core.ItemContainer):

+    """
+    A combobox is like a combination of an edit control and a listbox. It can be
+    displayed as static list with editable or read-only text field; or a drop-down
+    list with text field.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String value=EmptyString,
+            Point pos=DefaultPosition, Size size=DefaultSize,
+             List choices=[], long style=0, Validator validator=DefaultValidator,
+             String name=ComboBoxNameStr) -> ComboBox
+
+        Constructor, creates and shows a ComboBox control.
+        """

         newobj = _controls.new_ComboBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_ComboBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.ComboBox_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.ComboBox_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.ComboBox_SetValue(*args, **kwargs)
-    def Copy(*args, **kwargs): return _controls.ComboBox_Copy(*args, **kwargs)
-    def Cut(*args, **kwargs): return _controls.ComboBox_Cut(*args, **kwargs)
-    def Paste(*args, **kwargs): return _controls.ComboBox_Paste(*args, **kwargs)
-    def SetInsertionPoint(*args, **kwargs): return _controls.ComboBox_SetInsertionPoint(*args, **kwargs)
-    def GetInsertionPoint(*args, **kwargs): return _controls.ComboBox_GetInsertionPoint(*args, **kwargs)
-    def GetLastPosition(*args, **kwargs): return _controls.ComboBox_GetLastPosition(*args, **kwargs)
-    def Replace(*args, **kwargs): return _controls.ComboBox_Replace(*args, **kwargs)
-    def SetMark(*args, **kwargs): return _controls.ComboBox_SetMark(*args, **kwargs)
-    def SetEditable(*args, **kwargs): return _controls.ComboBox_SetEditable(*args, **kwargs)
-    def SetInsertionPointEnd(*args, **kwargs): return _controls.ComboBox_SetInsertionPointEnd(*args, **kwargs)
-    def Remove(*args, **kwargs): return _controls.ComboBox_Remove(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String value=EmptyString,
+            Point pos=DefaultPosition, Size size=DefaultSize,
+            List choices=[], long style=0, Validator validator=DefaultValidator,
+            String name=ChoiceNameStr) -> bool
+
+        Actually create the GUI wxComboBox control for 2-phase creation
+        """
+        return _controls.ComboBox_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """
+        GetValue() -> String
+
+        Returns the current value in the combobox text field.
+        """
+        return _controls.ComboBox_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(String value)"""
+        return _controls.ComboBox_SetValue(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """
+        Copy()
+
+        Copies the selected text to the clipboard.
+        """
+        return _controls.ComboBox_Copy(*args, **kwargs)
+
+    def Cut(*args, **kwargs):
+        """
+        Cut()
+
+        Copies the selected text to the clipboard and removes the selection.
+        """
+        return _controls.ComboBox_Cut(*args, **kwargs)
+
+    def Paste(*args, **kwargs):
+        """
+        Paste()
+
+        Pastes text from the clipboard to the text field.
+        """
+        return _controls.ComboBox_Paste(*args, **kwargs)
+
+    def SetInsertionPoint(*args, **kwargs):
+        """
+        SetInsertionPoint(long pos)
+
+        Sets the insertion point in the combobox text field.
+        """
+        return _controls.ComboBox_SetInsertionPoint(*args, **kwargs)
+
+    def GetInsertionPoint(*args, **kwargs):
+        """
+        GetInsertionPoint() -> long
+
+        Returns the insertion point for the combobox's text field.
+        """
+        return _controls.ComboBox_GetInsertionPoint(*args, **kwargs)
+
+    def GetLastPosition(*args, **kwargs):
+        """
+        GetLastPosition() -> long
+
+        Returns the last position in the combobox text field.
+        """
+        return _controls.ComboBox_GetLastPosition(*args, **kwargs)
+
+    def Replace(*args, **kwargs):
+        """
+        Replace(long from, long to, String value)
+
+        Replaces the text between two positions with the given text, in the
+        combobox text field.
+        """
+        return _controls.ComboBox_Replace(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """
+        SetSelection(int n)
+
+        Selects the text between the two positions, in the combobox text field.
+        """
+        return _controls.ComboBox_SetSelection(*args, **kwargs)
+
+    def SetMark(*args, **kwargs):
+        """SetMark(long from, long to)"""
+        return _controls.ComboBox_SetMark(*args, **kwargs)
+
+    def SetEditable(*args, **kwargs):
+        """SetEditable(bool editable)"""
+        return _controls.ComboBox_SetEditable(*args, **kwargs)
+
+    def SetInsertionPointEnd(*args, **kwargs):
+        """
+        SetInsertionPointEnd()
+
+        Sets the insertion point at the end of the combobox text field.
+        """
+        return _controls.ComboBox_SetInsertionPointEnd(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """
+        Remove(long from, long to)
+
+        Removes the text between the two positions in the combobox text field.
+        """
+        return _controls.ComboBox_Remove(*args, **kwargs)
+

 
 class ComboBoxPtr(ComboBox):
     def __init__(self, this):
 
 class ComboBoxPtr(ComboBox):
     def __init__(self, this):


@@ -174,8 +558,14 @@ class ComboBoxPtr(ComboBox):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ComboBox
 _controls.ComboBox_swigregister(ComboBoxPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ComboBox
 _controls.ComboBox_swigregister(ComboBoxPtr)

+ComboBoxNameStr = cvar.ComboBoxNameStr

 
 def PreComboBox(*args, **kwargs):
 
 def PreComboBox(*args, **kwargs):

+    """
+    PreComboBox() -> ComboBox
+
+    Precreate a ComboBox control for 2-phase creation.
+    """

     val = _controls.new_PreComboBox(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreComboBox(*args, **kwargs)
     val.thisown = 1
     return val


@@ -187,24 +577,66 @@ GA_VERTICAL = _controls.GA_VERTICAL
 GA_SMOOTH = _controls.GA_SMOOTH
 GA_PROGRESSBAR = _controls.GA_PROGRESSBAR
 class Gauge(core.Control):
 GA_SMOOTH = _controls.GA_SMOOTH
 GA_PROGRESSBAR = _controls.GA_PROGRESSBAR
 class Gauge(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGauge instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, int range, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=GA_HORIZONTAL, 
+            Validator validator=DefaultValidator, 
+            String name=GaugeNameStr) -> Gauge
+        """

         newobj = _controls.new_Gauge(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_Gauge(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.Gauge_Create(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.Gauge_SetRange(*args, **kwargs)
-    def GetRange(*args, **kwargs): return _controls.Gauge_GetRange(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.Gauge_SetValue(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.Gauge_GetValue(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.Gauge_IsVertical(*args, **kwargs)
-    def SetShadowWidth(*args, **kwargs): return _controls.Gauge_SetShadowWidth(*args, **kwargs)
-    def GetShadowWidth(*args, **kwargs): return _controls.Gauge_GetShadowWidth(*args, **kwargs)
-    def SetBezelFace(*args, **kwargs): return _controls.Gauge_SetBezelFace(*args, **kwargs)
-    def GetBezelFace(*args, **kwargs): return _controls.Gauge_GetBezelFace(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGauge instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, int range, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=GA_HORIZONTAL, 
+            Validator validator=DefaultValidator, 
+            String name=GaugeNameStr) -> bool
+        """
+        return _controls.Gauge_Create(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int range)"""
+        return _controls.Gauge_SetRange(*args, **kwargs)
+
+    def GetRange(*args, **kwargs):
+        """GetRange() -> int"""
+        return _controls.Gauge_GetRange(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int pos)"""
+        return _controls.Gauge_SetValue(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.Gauge_GetValue(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.Gauge_IsVertical(*args, **kwargs)
+
+    def SetShadowWidth(*args, **kwargs):
+        """SetShadowWidth(int w)"""
+        return _controls.Gauge_SetShadowWidth(*args, **kwargs)
+
+    def GetShadowWidth(*args, **kwargs):
+        """GetShadowWidth() -> int"""
+        return _controls.Gauge_GetShadowWidth(*args, **kwargs)
+
+    def SetBezelFace(*args, **kwargs):
+        """SetBezelFace(int w)"""
+        return _controls.Gauge_SetBezelFace(*args, **kwargs)
+
+    def GetBezelFace(*args, **kwargs):
+        """GetBezelFace() -> int"""
+        return _controls.Gauge_GetBezelFace(*args, **kwargs)
+

 
 class GaugePtr(Gauge):
     def __init__(self, this):
 
 class GaugePtr(Gauge):
     def __init__(self, this):


@@ -212,8 +644,10 @@ class GaugePtr(Gauge):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Gauge
 _controls.Gauge_swigregister(GaugePtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Gauge
 _controls.Gauge_swigregister(GaugePtr)

+GaugeNameStr = cvar.GaugeNameStr

 
 def PreGauge(*args, **kwargs):
 
 def PreGauge(*args, **kwargs):

+    """PreGauge() -> Gauge"""

     val = _controls.new_PreGauge(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreGauge(*args, **kwargs)
     val.thisown = 1
     return val


@@ -221,15 +655,28 @@ def PreGauge(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class StaticBox(core.Control):
 #---------------------------------------------------------------------------
 
 class StaticBox(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            String name=StaticBoxNameStr) -> StaticBox
+        """

         newobj = _controls.new_StaticBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_StaticBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.StaticBox_Create(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            String name=StaticBoxNameStr) -> bool
+        """
+        return _controls.StaticBox_Create(*args, **kwargs)
+

 
 class StaticBoxPtr(StaticBox):
     def __init__(self, this):
 
 class StaticBoxPtr(StaticBox):
     def __init__(self, this):


@@ -237,8 +684,12 @@ class StaticBoxPtr(StaticBox):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = StaticBox
 _controls.StaticBox_swigregister(StaticBoxPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = StaticBox
 _controls.StaticBox_swigregister(StaticBoxPtr)

+StaticBitmapNameStr = cvar.StaticBitmapNameStr
+StaticBoxNameStr = cvar.StaticBoxNameStr
+StaticTextNameStr = cvar.StaticTextNameStr

 
 def PreStaticBox(*args, **kwargs):
 
 def PreStaticBox(*args, **kwargs):

+    """PreStaticBox() -> StaticBox"""

     val = _controls.new_PreStaticBox(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreStaticBox(*args, **kwargs)
     val.thisown = 1
     return val


@@ -246,17 +697,37 @@ def PreStaticBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class StaticLine(core.Control):
 #---------------------------------------------------------------------------
 
 class StaticLine(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticLine instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=LI_HORIZONTAL, 
+            String name=StaticTextNameStr) -> StaticLine
+        """

         newobj = _controls.new_StaticLine(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_StaticLine(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.StaticLine_Create(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.StaticLine_IsVertical(*args, **kwargs)
-    GetDefaultSize = staticmethod(_controls.StaticLine_GetDefaultSize)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticLine instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=LI_HORIZONTAL, 
+            String name=StaticTextNameStr) -> bool
+        """
+        return _controls.StaticLine_Create(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.StaticLine_IsVertical(*args, **kwargs)
+
+    def GetDefaultSize(*args, **kwargs):
+        """GetDefaultSize() -> int"""
+        return _controls.StaticLine_GetDefaultSize(*args, **kwargs)
+
+    GetDefaultSize = staticmethod(GetDefaultSize)

 
 class StaticLinePtr(StaticLine):
     def __init__(self, this):
 
 class StaticLinePtr(StaticLine):
     def __init__(self, this):


@@ -266,24 +737,40 @@ class StaticLinePtr(StaticLine):
 _controls.StaticLine_swigregister(StaticLinePtr)
 
 def PreStaticLine(*args, **kwargs):
 _controls.StaticLine_swigregister(StaticLinePtr)
 
 def PreStaticLine(*args, **kwargs):

+    """PreStaticLine() -> StaticLine"""

     val = _controls.new_PreStaticLine(*args, **kwargs)
     val.thisown = 1
     return val
 
     val = _controls.new_PreStaticLine(*args, **kwargs)
     val.thisown = 1
     return val
 

-StaticLine_GetDefaultSize = _controls.StaticLine_GetDefaultSize
+def StaticLine_GetDefaultSize(*args, **kwargs):
+    """StaticLine_GetDefaultSize() -> int"""
+    return _controls.StaticLine_GetDefaultSize(*args, **kwargs)

 
 #---------------------------------------------------------------------------
 
 class StaticText(core.Control):
 
 #---------------------------------------------------------------------------
 
 class StaticText(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            String name=StaticTextNameStr) -> StaticText
+        """

         newobj = _controls.new_StaticText(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_StaticText(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.StaticText_Create(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            String name=StaticTextNameStr) -> bool
+        """
+        return _controls.StaticText_Create(*args, **kwargs)
+

 
 class StaticTextPtr(StaticText):
     def __init__(self, this):
 
 class StaticTextPtr(StaticText):
     def __init__(self, this):


@@ -293,6 +780,7 @@ class StaticTextPtr(StaticText):
 _controls.StaticText_swigregister(StaticTextPtr)
 
 def PreStaticText(*args, **kwargs):
 _controls.StaticText_swigregister(StaticTextPtr)
 
 def PreStaticText(*args, **kwargs):

+    """PreStaticText() -> StaticText"""

     val = _controls.new_PreStaticText(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreStaticText(*args, **kwargs)
     val.thisown = 1
     return val


@@ -300,17 +788,40 @@ def PreStaticText(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class StaticBitmap(core.Control):
 #---------------------------------------------------------------------------
 
 class StaticBitmap(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            String name=StaticBitmapNameStr) -> StaticBitmap
+        """

         newobj = _controls.new_StaticBitmap(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_StaticBitmap(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def Create(*args, **kwargs): return _controls.StaticBitmap_Create(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _controls.StaticBitmap_GetBitmap(*args, **kwargs)
-    def SetBitmap(*args, **kwargs): return _controls.StaticBitmap_SetBitmap(*args, **kwargs)
-    def SetIcon(*args, **kwargs): return _controls.StaticBitmap_SetIcon(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Bitmap bitmap, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            String name=StaticBitmapNameStr) -> bool
+        """
+        return _controls.StaticBitmap_Create(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> Bitmap"""
+        return _controls.StaticBitmap_GetBitmap(*args, **kwargs)
+
+    def SetBitmap(*args, **kwargs):
+        """SetBitmap(Bitmap bitmap)"""
+        return _controls.StaticBitmap_SetBitmap(*args, **kwargs)
+
+    def SetIcon(*args, **kwargs):
+        """SetIcon(Icon icon)"""
+        return _controls.StaticBitmap_SetIcon(*args, **kwargs)
+

 
 class StaticBitmapPtr(StaticBitmap):
     def __init__(self, this):
 
 class StaticBitmapPtr(StaticBitmap):
     def __init__(self, this):


@@ -320,6 +831,7 @@ class StaticBitmapPtr(StaticBitmap):
 _controls.StaticBitmap_swigregister(StaticBitmapPtr)
 
 def PreStaticBitmap(*args, **kwargs):
 _controls.StaticBitmap_swigregister(StaticBitmapPtr)
 
 def PreStaticBitmap(*args, **kwargs):

+    """PreStaticBitmap() -> StaticBitmap"""

     val = _controls.new_PreStaticBitmap(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreStaticBitmap(*args, **kwargs)
     val.thisown = 1
     return val


@@ -327,30 +839,111 @@ def PreStaticBitmap(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ListBox(core.ControlWithItems):
 #---------------------------------------------------------------------------
 
 class ListBox(core.ControlWithItems):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            wxArrayString choices=wxPyEmptyStringArray, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=ListBoxNameStr) -> ListBox
+        """

         newobj = _controls.new_ListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_ListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.ListBox_Create(*args, **kwargs)
-    def Insert(*args, **kwargs): return _controls.ListBox_Insert(*args, **kwargs)
-    def InsertItems(*args, **kwargs): return _controls.ListBox_InsertItems(*args, **kwargs)
-    def Set(*args, **kwargs): return _controls.ListBox_Set(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _controls.ListBox_IsSelected(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.ListBox_SetSelection(*args, **kwargs)
-    def Select(*args, **kwargs): return _controls.ListBox_Select(*args, **kwargs)
-    def Deselect(*args, **kwargs): return _controls.ListBox_Deselect(*args, **kwargs)
-    def DeselectAll(*args, **kwargs): return _controls.ListBox_DeselectAll(*args, **kwargs)
-    def SetStringSelection(*args, **kwargs): return _controls.ListBox_SetStringSelection(*args, **kwargs)
-    def GetSelections(*args, **kwargs): return _controls.ListBox_GetSelections(*args, **kwargs)
-    def SetFirstItem(*args, **kwargs): return _controls.ListBox_SetFirstItem(*args, **kwargs)
-    def SetFirstItemStr(*args, **kwargs): return _controls.ListBox_SetFirstItemStr(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _controls.ListBox_EnsureVisible(*args, **kwargs)
-    def AppendAndEnsureVisible(*args, **kwargs): return _controls.ListBox_AppendAndEnsureVisible(*args, **kwargs)
-    def IsSorted(*args, **kwargs): return _controls.ListBox_IsSorted(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            wxArrayString choices=wxPyEmptyStringArray, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=ListBoxNameStr) -> bool
+        """
+        return _controls.ListBox_Create(*args, **kwargs)
+
+    def Insert(*args, **kwargs):
+        """
+        Insert(String item, int pos, PyObject clientData=None)
+
+        Insert an item into the control before the item at the pos index,
+        optionally associating some data object with the item.
+        """
+        return _controls.ListBox_Insert(*args, **kwargs)
+
+    def InsertItems(*args, **kwargs):
+        """InsertItems(wxArrayString items, int pos)"""
+        return _controls.ListBox_InsertItems(*args, **kwargs)
+
+    def Set(*args, **kwargs):
+        """Set(wxArrayString items)"""
+        return _controls.ListBox_Set(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(int n) -> bool"""
+        return _controls.ListBox_IsSelected(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int n, bool select=True)"""
+        return _controls.ListBox_SetSelection(*args, **kwargs)
+
+    def Select(*args, **kwargs):
+        """
+        Select(int n)
+
+        Sets the item at index 'n' to be the selected item.
+        """
+        return _controls.ListBox_Select(*args, **kwargs)
+
+    def Deselect(*args, **kwargs):
+        """Deselect(int n)"""
+        return _controls.ListBox_Deselect(*args, **kwargs)
+
+    def DeselectAll(*args, **kwargs):
+        """DeselectAll(int itemToLeaveSelected=-1)"""
+        return _controls.ListBox_DeselectAll(*args, **kwargs)
+
+    def SetStringSelection(*args, **kwargs):
+        """SetStringSelection(String s, bool select=True) -> bool"""
+        return _controls.ListBox_SetStringSelection(*args, **kwargs)
+
+    def GetSelections(*args, **kwargs):
+        """GetSelections() -> PyObject"""
+        return _controls.ListBox_GetSelections(*args, **kwargs)
+
+    def SetFirstItem(*args, **kwargs):
+        """SetFirstItem(int n)"""
+        return _controls.ListBox_SetFirstItem(*args, **kwargs)
+
+    def SetFirstItemStr(*args, **kwargs):
+        """SetFirstItemStr(String s)"""
+        return _controls.ListBox_SetFirstItemStr(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(int n)"""
+        return _controls.ListBox_EnsureVisible(*args, **kwargs)
+
+    def AppendAndEnsureVisible(*args, **kwargs):
+        """AppendAndEnsureVisible(String s)"""
+        return _controls.ListBox_AppendAndEnsureVisible(*args, **kwargs)
+
+    def IsSorted(*args, **kwargs):
+        """IsSorted() -> bool"""
+        return _controls.ListBox_IsSorted(*args, **kwargs)
+
+    def SetItemForegroundColour(*args, **kwargs):
+        """SetItemForegroundColour(int item, Colour c)"""
+        return _controls.ListBox_SetItemForegroundColour(*args, **kwargs)
+
+    def SetItemBackgroundColour(*args, **kwargs):
+        """SetItemBackgroundColour(int item, Colour c)"""
+        return _controls.ListBox_SetItemBackgroundColour(*args, **kwargs)
+
+    def SetItemFont(*args, **kwargs):
+        """SetItemFont(int item, Font f)"""
+        return _controls.ListBox_SetItemFont(*args, **kwargs)
+

 
 class ListBoxPtr(ListBox):
     def __init__(self, this):
 
 class ListBoxPtr(ListBox):
     def __init__(self, this):


@@ -358,8 +951,10 @@ class ListBoxPtr(ListBox):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ListBox
 _controls.ListBox_swigregister(ListBoxPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ListBox
 _controls.ListBox_swigregister(ListBoxPtr)

+ListBoxNameStr = cvar.ListBoxNameStr

 
 def PreListBox(*args, **kwargs):
 
 def PreListBox(*args, **kwargs):

+    """PreListBox() -> ListBox"""

     val = _controls.new_PreListBox(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreListBox(*args, **kwargs)
     val.thisown = 1
     return val


@@ -367,19 +962,58 @@ def PreListBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class CheckListBox(ListBox):
 #---------------------------------------------------------------------------
 
 class CheckListBox(ListBox):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxCheckListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            wxArrayString choices=wxPyEmptyStringArray, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=ListBoxNameStr) -> CheckListBox
+        """

         newobj = _controls.new_CheckListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_CheckListBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def Create(*args, **kwargs): return _controls.CheckListBox_Create(*args, **kwargs)
-    def IsChecked(*args, **kwargs): return _controls.CheckListBox_IsChecked(*args, **kwargs)
-    def Check(*args, **kwargs): return _controls.CheckListBox_Check(*args, **kwargs)
-    def GetItemHeight(*args, **kwargs): return _controls.CheckListBox_GetItemHeight(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.CheckListBox_HitTest(*args, **kwargs)
-    def HitTestXY(*args, **kwargs): return _controls.CheckListBox_HitTestXY(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCheckListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            wxArrayString choices=wxPyEmptyStringArray, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=ListBoxNameStr) -> bool
+        """
+        return _controls.CheckListBox_Create(*args, **kwargs)
+
+    def IsChecked(*args, **kwargs):
+        """IsChecked(int index) -> bool"""
+        return _controls.CheckListBox_IsChecked(*args, **kwargs)
+
+    def Check(*args, **kwargs):
+        """Check(int index, int check=True)"""
+        return _controls.CheckListBox_Check(*args, **kwargs)
+
+    def GetItemHeight(*args, **kwargs):
+        """GetItemHeight() -> int"""
+        return _controls.CheckListBox_GetItemHeight(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """
+        HitTest(Point pt) -> int
+
+        Test where the given (in client coords) point lies
+        """
+        return _controls.CheckListBox_HitTest(*args, **kwargs)
+
+    def HitTestXY(*args, **kwargs):
+        """
+        HitTestXY(int x, int y) -> int
+
+        Test where the given (in client coords) point lies
+        """
+        return _controls.CheckListBox_HitTestXY(*args, **kwargs)
+

 
 class CheckListBoxPtr(CheckListBox):
     def __init__(self, this):
 
 class CheckListBoxPtr(CheckListBox):
     def __init__(self, this):


@@ -389,6 +1023,7 @@ class CheckListBoxPtr(CheckListBox):
 _controls.CheckListBox_swigregister(CheckListBoxPtr)
 
 def PreCheckListBox(*args, **kwargs):
 _controls.CheckListBox_swigregister(CheckListBoxPtr)
 
 def PreCheckListBox(*args, **kwargs):

+    """PreCheckListBox() -> CheckListBox"""

     val = _controls.new_PreCheckListBox(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreCheckListBox(*args, **kwargs)
     val.thisown = 1
     return val


@@ -431,41 +1066,139 @@ TEXT_ATTR_ALIGNMENT = _controls.TEXT_ATTR_ALIGNMENT
 TEXT_ATTR_LEFT_INDENT = _controls.TEXT_ATTR_LEFT_INDENT
 TEXT_ATTR_RIGHT_INDENT = _controls.TEXT_ATTR_RIGHT_INDENT
 TEXT_ATTR_TABS = _controls.TEXT_ATTR_TABS
 TEXT_ATTR_LEFT_INDENT = _controls.TEXT_ATTR_LEFT_INDENT
 TEXT_ATTR_RIGHT_INDENT = _controls.TEXT_ATTR_RIGHT_INDENT
 TEXT_ATTR_TABS = _controls.TEXT_ATTR_TABS

+TE_HT_UNKNOWN = _controls.TE_HT_UNKNOWN
+TE_HT_BEFORE = _controls.TE_HT_BEFORE
+TE_HT_ON_TEXT = _controls.TE_HT_ON_TEXT
+TE_HT_BELOW = _controls.TE_HT_BELOW
+TE_HT_BEYOND = _controls.TE_HT_BEYOND

 class TextAttr(object):
 class TextAttr(object):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args):
     def __init__(self, *args):

+        """
+        __init__() -> TextAttr
+        __init__(Colour colText, Colour colBack=wxNullColour, Font font=wxNullFont, 
+            int alignment=TEXT_ALIGNMENT_DEFAULT) -> TextAttr
+        """

         newobj = _controls.new_TextAttr(*args)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_TextAttr(*args)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def Init(*args, **kwargs): return _controls.TextAttr_Init(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _controls.TextAttr_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.TextAttr_SetBackgroundColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _controls.TextAttr_SetFont(*args, **kwargs)
-    def SetAlignment(*args, **kwargs): return _controls.TextAttr_SetAlignment(*args, **kwargs)
-    def SetTabs(*args, **kwargs): return _controls.TextAttr_SetTabs(*args, **kwargs)
-    def SetLeftIndent(*args, **kwargs): return _controls.TextAttr_SetLeftIndent(*args, **kwargs)
-    def SetRightIndent(*args, **kwargs): return _controls.TextAttr_SetRightIndent(*args, **kwargs)
-    def SetFlags(*args, **kwargs): return _controls.TextAttr_SetFlags(*args, **kwargs)
-    def HasTextColour(*args, **kwargs): return _controls.TextAttr_HasTextColour(*args, **kwargs)
-    def HasBackgroundColour(*args, **kwargs): return _controls.TextAttr_HasBackgroundColour(*args, **kwargs)
-    def HasFont(*args, **kwargs): return _controls.TextAttr_HasFont(*args, **kwargs)
-    def HasAlignment(*args, **kwargs): return _controls.TextAttr_HasAlignment(*args, **kwargs)
-    def HasTabs(*args, **kwargs): return _controls.TextAttr_HasTabs(*args, **kwargs)
-    def HasLeftIndent(*args, **kwargs): return _controls.TextAttr_HasLeftIndent(*args, **kwargs)
-    def HasRightIndent(*args, **kwargs): return _controls.TextAttr_HasRightIndent(*args, **kwargs)
-    def HasFlag(*args, **kwargs): return _controls.TextAttr_HasFlag(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.TextAttr_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _controls.TextAttr_GetBackgroundColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _controls.TextAttr_GetFont(*args, **kwargs)
-    def GetAlignment(*args, **kwargs): return _controls.TextAttr_GetAlignment(*args, **kwargs)
-    def GetTabs(*args, **kwargs): return _controls.TextAttr_GetTabs(*args, **kwargs)
-    def GetLeftIndent(*args, **kwargs): return _controls.TextAttr_GetLeftIndent(*args, **kwargs)
-    def GetRightIndent(*args, **kwargs): return _controls.TextAttr_GetRightIndent(*args, **kwargs)
-    def GetFlags(*args, **kwargs): return _controls.TextAttr_GetFlags(*args, **kwargs)
-    def IsDefault(*args, **kwargs): return _controls.TextAttr_IsDefault(*args, **kwargs)
-    Combine = staticmethod(_controls.TextAttr_Combine)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __del__(self, destroy=_controls.delete_TextAttr):
+        """__del__()"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def Init(*args, **kwargs):
+        """Init()"""
+        return _controls.TextAttr_Init(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(Colour colText)"""
+        return _controls.TextAttr_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(Colour colBack)"""
+        return _controls.TextAttr_SetBackgroundColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(Font font, long flags=TEXT_ATTR_FONT)"""
+        return _controls.TextAttr_SetFont(*args, **kwargs)
+
+    def SetAlignment(*args, **kwargs):
+        """SetAlignment(int alignment)"""
+        return _controls.TextAttr_SetAlignment(*args, **kwargs)
+
+    def SetTabs(*args, **kwargs):
+        """SetTabs(wxArrayInt tabs)"""
+        return _controls.TextAttr_SetTabs(*args, **kwargs)
+
+    def SetLeftIndent(*args, **kwargs):
+        """SetLeftIndent(int indent)"""
+        return _controls.TextAttr_SetLeftIndent(*args, **kwargs)
+
+    def SetRightIndent(*args, **kwargs):
+        """SetRightIndent(int indent)"""
+        return _controls.TextAttr_SetRightIndent(*args, **kwargs)
+
+    def SetFlags(*args, **kwargs):
+        """SetFlags(long flags)"""
+        return _controls.TextAttr_SetFlags(*args, **kwargs)
+
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour() -> bool"""
+        return _controls.TextAttr_HasTextColour(*args, **kwargs)
+
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour() -> bool"""
+        return _controls.TextAttr_HasBackgroundColour(*args, **kwargs)
+
+    def HasFont(*args, **kwargs):
+        """HasFont() -> bool"""
+        return _controls.TextAttr_HasFont(*args, **kwargs)
+
+    def HasAlignment(*args, **kwargs):
+        """HasAlignment() -> bool"""
+        return _controls.TextAttr_HasAlignment(*args, **kwargs)
+
+    def HasTabs(*args, **kwargs):
+        """HasTabs() -> bool"""
+        return _controls.TextAttr_HasTabs(*args, **kwargs)
+
+    def HasLeftIndent(*args, **kwargs):
+        """HasLeftIndent() -> bool"""
+        return _controls.TextAttr_HasLeftIndent(*args, **kwargs)
+
+    def HasRightIndent(*args, **kwargs):
+        """HasRightIndent() -> bool"""
+        return _controls.TextAttr_HasRightIndent(*args, **kwargs)
+
+    def HasFlag(*args, **kwargs):
+        """HasFlag(long flag) -> bool"""
+        return _controls.TextAttr_HasFlag(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> Colour"""
+        return _controls.TextAttr_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> Colour"""
+        return _controls.TextAttr_GetBackgroundColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> Font"""
+        return _controls.TextAttr_GetFont(*args, **kwargs)
+
+    def GetAlignment(*args, **kwargs):
+        """GetAlignment() -> int"""
+        return _controls.TextAttr_GetAlignment(*args, **kwargs)
+
+    def GetTabs(*args, **kwargs):
+        """GetTabs() -> wxArrayInt"""
+        return _controls.TextAttr_GetTabs(*args, **kwargs)
+
+    def GetLeftIndent(*args, **kwargs):
+        """GetLeftIndent() -> long"""
+        return _controls.TextAttr_GetLeftIndent(*args, **kwargs)
+
+    def GetRightIndent(*args, **kwargs):
+        """GetRightIndent() -> long"""
+        return _controls.TextAttr_GetRightIndent(*args, **kwargs)
+
+    def GetFlags(*args, **kwargs):
+        """GetFlags() -> long"""
+        return _controls.TextAttr_GetFlags(*args, **kwargs)
+
+    def IsDefault(*args, **kwargs):
+        """IsDefault() -> bool"""
+        return _controls.TextAttr_IsDefault(*args, **kwargs)
+
+    def Combine(*args, **kwargs):
+        """Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
+        return _controls.TextAttr_Combine(*args, **kwargs)
+
+    Combine = staticmethod(Combine)

 
 class TextAttrPtr(TextAttr):
     def __init__(self, this):
 
 class TextAttrPtr(TextAttr):
     def __init__(self, this):


@@ -473,68 +1206,247 @@ class TextAttrPtr(TextAttr):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = TextAttr
 _controls.TextAttr_swigregister(TextAttrPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = TextAttr
 _controls.TextAttr_swigregister(TextAttrPtr)

+TextCtrlNameStr = cvar.TextCtrlNameStr

 
 

-TextAttr_Combine = _controls.TextAttr_Combine
+def TextAttr_Combine(*args, **kwargs):
+    """TextAttr_Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
+    return _controls.TextAttr_Combine(*args, **kwargs)

 
 class TextCtrl(core.Control):
 
 class TextCtrl(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=TextCtrlNameStr) -> TextCtrl
+        """

         newobj = _controls.new_TextCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_TextCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.TextCtrl_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.TextCtrl_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.TextCtrl_SetValue(*args, **kwargs)
-    def GetRange(*args, **kwargs): return _controls.TextCtrl_GetRange(*args, **kwargs)
-    def GetLineLength(*args, **kwargs): return _controls.TextCtrl_GetLineLength(*args, **kwargs)
-    def GetLineText(*args, **kwargs): return _controls.TextCtrl_GetLineText(*args, **kwargs)
-    def GetNumberOfLines(*args, **kwargs): return _controls.TextCtrl_GetNumberOfLines(*args, **kwargs)
-    def IsModified(*args, **kwargs): return _controls.TextCtrl_IsModified(*args, **kwargs)
-    def IsEditable(*args, **kwargs): return _controls.TextCtrl_IsEditable(*args, **kwargs)
-    def IsSingleLine(*args, **kwargs): return _controls.TextCtrl_IsSingleLine(*args, **kwargs)
-    def IsMultiLine(*args, **kwargs): return _controls.TextCtrl_IsMultiLine(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.TextCtrl_GetSelection(*args, **kwargs)
-    def GetStringSelection(*args, **kwargs): return _controls.TextCtrl_GetStringSelection(*args, **kwargs)
-    def Clear(*args, **kwargs): return _controls.TextCtrl_Clear(*args, **kwargs)
-    def Replace(*args, **kwargs): return _controls.TextCtrl_Replace(*args, **kwargs)
-    def Remove(*args, **kwargs): return _controls.TextCtrl_Remove(*args, **kwargs)
-    def LoadFile(*args, **kwargs): return _controls.TextCtrl_LoadFile(*args, **kwargs)
-    def SaveFile(*args, **kwargs): return _controls.TextCtrl_SaveFile(*args, **kwargs)
-    def MarkDirty(*args, **kwargs): return _controls.TextCtrl_MarkDirty(*args, **kwargs)
-    def DiscardEdits(*args, **kwargs): return _controls.TextCtrl_DiscardEdits(*args, **kwargs)
-    def SetMaxLength(*args, **kwargs): return _controls.TextCtrl_SetMaxLength(*args, **kwargs)
-    def WriteText(*args, **kwargs): return _controls.TextCtrl_WriteText(*args, **kwargs)
-    def AppendText(*args, **kwargs): return _controls.TextCtrl_AppendText(*args, **kwargs)
-    def EmulateKeyPress(*args, **kwargs): return _controls.TextCtrl_EmulateKeyPress(*args, **kwargs)
-    def SetStyle(*args, **kwargs): return _controls.TextCtrl_SetStyle(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _controls.TextCtrl_GetStyle(*args, **kwargs)
-    def SetDefaultStyle(*args, **kwargs): return _controls.TextCtrl_SetDefaultStyle(*args, **kwargs)
-    def GetDefaultStyle(*args, **kwargs): return _controls.TextCtrl_GetDefaultStyle(*args, **kwargs)
-    def XYToPosition(*args, **kwargs): return _controls.TextCtrl_XYToPosition(*args, **kwargs)
-    def PositionToXY(*args, **kwargs): return _controls.TextCtrl_PositionToXY(*args, **kwargs)
-    def ShowPosition(*args, **kwargs): return _controls.TextCtrl_ShowPosition(*args, **kwargs)
-    def Copy(*args, **kwargs): return _controls.TextCtrl_Copy(*args, **kwargs)
-    def Cut(*args, **kwargs): return _controls.TextCtrl_Cut(*args, **kwargs)
-    def Paste(*args, **kwargs): return _controls.TextCtrl_Paste(*args, **kwargs)
-    def CanCopy(*args, **kwargs): return _controls.TextCtrl_CanCopy(*args, **kwargs)
-    def CanCut(*args, **kwargs): return _controls.TextCtrl_CanCut(*args, **kwargs)
-    def CanPaste(*args, **kwargs): return _controls.TextCtrl_CanPaste(*args, **kwargs)
-    def Undo(*args, **kwargs): return _controls.TextCtrl_Undo(*args, **kwargs)
-    def Redo(*args, **kwargs): return _controls.TextCtrl_Redo(*args, **kwargs)
-    def CanUndo(*args, **kwargs): return _controls.TextCtrl_CanUndo(*args, **kwargs)
-    def CanRedo(*args, **kwargs): return _controls.TextCtrl_CanRedo(*args, **kwargs)
-    def SetInsertionPoint(*args, **kwargs): return _controls.TextCtrl_SetInsertionPoint(*args, **kwargs)
-    def SetInsertionPointEnd(*args, **kwargs): return _controls.TextCtrl_SetInsertionPointEnd(*args, **kwargs)
-    def GetInsertionPoint(*args, **kwargs): return _controls.TextCtrl_GetInsertionPoint(*args, **kwargs)
-    def GetLastPosition(*args, **kwargs): return _controls.TextCtrl_GetLastPosition(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.TextCtrl_SetSelection(*args, **kwargs)
-    def SelectAll(*args, **kwargs): return _controls.TextCtrl_SelectAll(*args, **kwargs)
-    def SetEditable(*args, **kwargs): return _controls.TextCtrl_SetEditable(*args, **kwargs)
-    def write(*args, **kwargs): return _controls.TextCtrl_write(*args, **kwargs)
-    def GetString(*args, **kwargs): return _controls.TextCtrl_GetString(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=TextCtrlNameStr) -> bool
+        """
+        return _controls.TextCtrl_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> String"""
+        return _controls.TextCtrl_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(String value)"""
+        return _controls.TextCtrl_SetValue(*args, **kwargs)
+
+    def GetRange(*args, **kwargs):
+        """GetRange(long from, long to) -> String"""
+        return _controls.TextCtrl_GetRange(*args, **kwargs)
+
+    def GetLineLength(*args, **kwargs):
+        """GetLineLength(long lineNo) -> int"""
+        return _controls.TextCtrl_GetLineLength(*args, **kwargs)
+
+    def GetLineText(*args, **kwargs):
+        """GetLineText(long lineNo) -> String"""
+        return _controls.TextCtrl_GetLineText(*args, **kwargs)
+
+    def GetNumberOfLines(*args, **kwargs):
+        """GetNumberOfLines() -> int"""
+        return _controls.TextCtrl_GetNumberOfLines(*args, **kwargs)
+
+    def IsModified(*args, **kwargs):
+        """IsModified() -> bool"""
+        return _controls.TextCtrl_IsModified(*args, **kwargs)
+
+    def IsEditable(*args, **kwargs):
+        """IsEditable() -> bool"""
+        return _controls.TextCtrl_IsEditable(*args, **kwargs)
+
+    def IsSingleLine(*args, **kwargs):
+        """IsSingleLine() -> bool"""
+        return _controls.TextCtrl_IsSingleLine(*args, **kwargs)
+
+    def IsMultiLine(*args, **kwargs):
+        """IsMultiLine() -> bool"""
+        return _controls.TextCtrl_IsMultiLine(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """
+        GetSelection() -> (from, to)
+
+        If the return values from and to are the same, there is no selection.
+        """
+        return _controls.TextCtrl_GetSelection(*args, **kwargs)
+
+    def GetStringSelection(*args, **kwargs):
+        """GetStringSelection() -> String"""
+        return _controls.TextCtrl_GetStringSelection(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _controls.TextCtrl_Clear(*args, **kwargs)
+
+    def Replace(*args, **kwargs):
+        """Replace(long from, long to, String value)"""
+        return _controls.TextCtrl_Replace(*args, **kwargs)
+
+    def Remove(*args, **kwargs):
+        """Remove(long from, long to)"""
+        return _controls.TextCtrl_Remove(*args, **kwargs)
+
+    def LoadFile(*args, **kwargs):
+        """LoadFile(String file) -> bool"""
+        return _controls.TextCtrl_LoadFile(*args, **kwargs)
+
+    def SaveFile(*args, **kwargs):
+        """SaveFile(String file=EmptyString) -> bool"""
+        return _controls.TextCtrl_SaveFile(*args, **kwargs)
+
+    def MarkDirty(*args, **kwargs):
+        """MarkDirty()"""
+        return _controls.TextCtrl_MarkDirty(*args, **kwargs)
+
+    def DiscardEdits(*args, **kwargs):
+        """DiscardEdits()"""
+        return _controls.TextCtrl_DiscardEdits(*args, **kwargs)
+
+    def SetMaxLength(*args, **kwargs):
+        """SetMaxLength(unsigned long len)"""
+        return _controls.TextCtrl_SetMaxLength(*args, **kwargs)
+
+    def WriteText(*args, **kwargs):
+        """WriteText(String text)"""
+        return _controls.TextCtrl_WriteText(*args, **kwargs)
+
+    def AppendText(*args, **kwargs):
+        """AppendText(String text)"""
+        return _controls.TextCtrl_AppendText(*args, **kwargs)
+
+    def EmulateKeyPress(*args, **kwargs):
+        """EmulateKeyPress(KeyEvent event) -> bool"""
+        return _controls.TextCtrl_EmulateKeyPress(*args, **kwargs)
+
+    def SetStyle(*args, **kwargs):
+        """SetStyle(long start, long end, TextAttr style) -> bool"""
+        return _controls.TextCtrl_SetStyle(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle(long position, TextAttr style) -> bool"""
+        return _controls.TextCtrl_GetStyle(*args, **kwargs)
+
+    def SetDefaultStyle(*args, **kwargs):
+        """SetDefaultStyle(TextAttr style) -> bool"""
+        return _controls.TextCtrl_SetDefaultStyle(*args, **kwargs)
+
+    def GetDefaultStyle(*args, **kwargs):
+        """GetDefaultStyle() -> TextAttr"""
+        return _controls.TextCtrl_GetDefaultStyle(*args, **kwargs)
+
+    def XYToPosition(*args, **kwargs):
+        """XYToPosition(long x, long y) -> long"""
+        return _controls.TextCtrl_XYToPosition(*args, **kwargs)
+
+    def PositionToXY(*args, **kwargs):
+        """PositionToXY(long pos) -> (x, y)"""
+        return _controls.TextCtrl_PositionToXY(*args, **kwargs)
+
+    def ShowPosition(*args, **kwargs):
+        """ShowPosition(long pos)"""
+        return _controls.TextCtrl_ShowPosition(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """
+        HitTest(Point pt) -> (result, row, col)
+
+        Find the character at position given in pixels.
+        NB: pt is in device coords (not adjusted for the client area
+        origin nor scrolling)
+        """
+        return _controls.TextCtrl_HitTest(*args, **kwargs)
+
+    def Copy(*args, **kwargs):
+        """Copy()"""
+        return _controls.TextCtrl_Copy(*args, **kwargs)
+
+    def Cut(*args, **kwargs):
+        """Cut()"""
+        return _controls.TextCtrl_Cut(*args, **kwargs)
+
+    def Paste(*args, **kwargs):
+        """Paste()"""
+        return _controls.TextCtrl_Paste(*args, **kwargs)
+
+    def CanCopy(*args, **kwargs):
+        """CanCopy() -> bool"""
+        return _controls.TextCtrl_CanCopy(*args, **kwargs)
+
+    def CanCut(*args, **kwargs):
+        """CanCut() -> bool"""
+        return _controls.TextCtrl_CanCut(*args, **kwargs)
+
+    def CanPaste(*args, **kwargs):
+        """CanPaste() -> bool"""
+        return _controls.TextCtrl_CanPaste(*args, **kwargs)
+
+    def Undo(*args, **kwargs):
+        """Undo()"""
+        return _controls.TextCtrl_Undo(*args, **kwargs)
+
+    def Redo(*args, **kwargs):
+        """Redo()"""
+        return _controls.TextCtrl_Redo(*args, **kwargs)
+
+    def CanUndo(*args, **kwargs):
+        """CanUndo() -> bool"""
+        return _controls.TextCtrl_CanUndo(*args, **kwargs)
+
+    def CanRedo(*args, **kwargs):
+        """CanRedo() -> bool"""
+        return _controls.TextCtrl_CanRedo(*args, **kwargs)
+
+    def SetInsertionPoint(*args, **kwargs):
+        """SetInsertionPoint(long pos)"""
+        return _controls.TextCtrl_SetInsertionPoint(*args, **kwargs)
+
+    def SetInsertionPointEnd(*args, **kwargs):
+        """SetInsertionPointEnd()"""
+        return _controls.TextCtrl_SetInsertionPointEnd(*args, **kwargs)
+
+    def GetInsertionPoint(*args, **kwargs):
+        """GetInsertionPoint() -> long"""
+        return _controls.TextCtrl_GetInsertionPoint(*args, **kwargs)
+
+    def GetLastPosition(*args, **kwargs):
+        """GetLastPosition() -> long"""
+        return _controls.TextCtrl_GetLastPosition(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(long from, long to)"""
+        return _controls.TextCtrl_SetSelection(*args, **kwargs)
+
+    def SelectAll(*args, **kwargs):
+        """SelectAll()"""
+        return _controls.TextCtrl_SelectAll(*args, **kwargs)
+
+    def SetEditable(*args, **kwargs):
+        """SetEditable(bool editable)"""
+        return _controls.TextCtrl_SetEditable(*args, **kwargs)
+
+    def write(*args, **kwargs):
+        """write(String text)"""
+        return _controls.TextCtrl_write(*args, **kwargs)
+
+    def GetString(*args, **kwargs):
+        """GetString(long from, long to) -> String"""
+        return _controls.TextCtrl_GetString(*args, **kwargs)
+

 
 class TextCtrlPtr(TextCtrl):
     def __init__(self, this):
 
 class TextCtrlPtr(TextCtrl):
     def __init__(self, this):


@@ -544,6 +1456,7 @@ class TextCtrlPtr(TextCtrl):
 _controls.TextCtrl_swigregister(TextCtrlPtr)
 
 def PreTextCtrl(*args, **kwargs):
 _controls.TextCtrl_swigregister(TextCtrlPtr)
 
 def PreTextCtrl(*args, **kwargs):

+    """PreTextCtrl() -> TextCtrl"""

     val = _controls.new_PreTextCtrl(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreTextCtrl(*args, **kwargs)
     val.thisown = 1
     return val


@@ -553,16 +1466,26 @@ wxEVT_COMMAND_TEXT_ENTER = _controls.wxEVT_COMMAND_TEXT_ENTER
 wxEVT_COMMAND_TEXT_URL = _controls.wxEVT_COMMAND_TEXT_URL
 wxEVT_COMMAND_TEXT_MAXLEN = _controls.wxEVT_COMMAND_TEXT_MAXLEN
 class TextUrlEvent(core.CommandEvent):
 wxEVT_COMMAND_TEXT_URL = _controls.wxEVT_COMMAND_TEXT_URL
 wxEVT_COMMAND_TEXT_MAXLEN = _controls.wxEVT_COMMAND_TEXT_MAXLEN
 class TextUrlEvent(core.CommandEvent):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTextUrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__(int winid, MouseEvent evtMouse, long start, long end) -> TextUrlEvent"""

         newobj = _controls.new_TextUrlEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_TextUrlEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def GetMouseEvent(*args, **kwargs): return _controls.TextUrlEvent_GetMouseEvent(*args, **kwargs)
-    def GetURLStart(*args, **kwargs): return _controls.TextUrlEvent_GetURLStart(*args, **kwargs)
-    def GetURLEnd(*args, **kwargs): return _controls.TextUrlEvent_GetURLEnd(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextUrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetMouseEvent(*args, **kwargs):
+        """GetMouseEvent() -> MouseEvent"""
+        return _controls.TextUrlEvent_GetMouseEvent(*args, **kwargs)
+
+    def GetURLStart(*args, **kwargs):
+        """GetURLStart() -> long"""
+        return _controls.TextUrlEvent_GetURLStart(*args, **kwargs)
+
+    def GetURLEnd(*args, **kwargs):
+        """GetURLEnd() -> long"""
+        return _controls.TextUrlEvent_GetURLEnd(*args, **kwargs)
+

 
 class TextUrlEventPtr(TextUrlEvent):
     def __init__(self, this):
 
 class TextUrlEventPtr(TextUrlEvent):
     def __init__(self, this):


@@ -579,23 +1502,76 @@ EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1)
 #---------------------------------------------------------------------------
 
 class ScrollBar(core.Control):
 #---------------------------------------------------------------------------
 
 class ScrollBar(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxScrollBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=SB_HORIZONTAL, 
+            Validator validator=DefaultValidator, String name=ScrollBarNameStr) -> ScrollBar
+        """

         newobj = _controls.new_ScrollBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_ScrollBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.ScrollBar_Create(*args, **kwargs)
-    def GetThumbPosition(*args, **kwargs): return _controls.ScrollBar_GetThumbPosition(*args, **kwargs)
-    def GetThumbSize(*args, **kwargs): return _controls.ScrollBar_GetThumbSize(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=SB_HORIZONTAL, 
+            Validator validator=DefaultValidator, String name=ScrollBarNameStr) -> bool
+
+        Do the 2nd phase and create the GUI control.
+        """
+        return _controls.ScrollBar_Create(*args, **kwargs)
+
+    def GetThumbPosition(*args, **kwargs):
+        """GetThumbPosition() -> int"""
+        return _controls.ScrollBar_GetThumbPosition(*args, **kwargs)
+
+    def GetThumbSize(*args, **kwargs):
+        """GetThumbSize() -> int"""
+        return _controls.ScrollBar_GetThumbSize(*args, **kwargs)
+

     GetThumbLength = GetThumbSize 
     GetThumbLength = GetThumbSize 

-    def GetPageSize(*args, **kwargs): return _controls.ScrollBar_GetPageSize(*args, **kwargs)
-    def GetRange(*args, **kwargs): return _controls.ScrollBar_GetRange(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.ScrollBar_IsVertical(*args, **kwargs)
-    def SetThumbPosition(*args, **kwargs): return _controls.ScrollBar_SetThumbPosition(*args, **kwargs)
-    def SetScrollbar(*args, **kwargs): return _controls.ScrollBar_SetScrollbar(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxScrollBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPageSize(*args, **kwargs):
+        """GetPageSize() -> int"""
+        return _controls.ScrollBar_GetPageSize(*args, **kwargs)
+
+    def GetRange(*args, **kwargs):
+        """GetRange() -> int"""
+        return _controls.ScrollBar_GetRange(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.ScrollBar_IsVertical(*args, **kwargs)
+
+    def SetThumbPosition(*args, **kwargs):
+        """SetThumbPosition(int viewStart)"""
+        return _controls.ScrollBar_SetThumbPosition(*args, **kwargs)
+
+    def SetScrollbar(*args, **kwargs):
+        """
+        SetScrollbar(int position, int thumbSize, int range, int pageSize, 
+            bool refresh=True)
+
+        Sets the scrollbar properties of a built-in scrollbar.
+
+            orientation: Determines the scrollbar whose page size is to be
+                         set. May be wx.HORIZONTAL or wx.VERTICAL.
+
+            position:    The position of the scrollbar in scroll units.
+
+            thumbSize:   The size of the thumb, or visible portion of the
+                         scrollbar, in scroll units.
+
+            range:       The maximum position of the scrollbar.
+
+            refresh:     True to redraw the scrollbar, false otherwise.
+        """
+        return _controls.ScrollBar_SetScrollbar(*args, **kwargs)
+

 
 class ScrollBarPtr(ScrollBar):
     def __init__(self, this):
 
 class ScrollBarPtr(ScrollBar):
     def __init__(self, this):


@@ -603,8 +1579,10 @@ class ScrollBarPtr(ScrollBar):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ScrollBar
 _controls.ScrollBar_swigregister(ScrollBarPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ScrollBar
 _controls.ScrollBar_swigregister(ScrollBarPtr)

+ScrollBarNameStr = cvar.ScrollBarNameStr

 
 def PreScrollBar(*args, **kwargs):
 
 def PreScrollBar(*args, **kwargs):

+    """PreScrollBar() -> ScrollBar"""

     val = _controls.new_PreScrollBar(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreScrollBar(*args, **kwargs)
     val.thisown = 1
     return val


@@ -616,23 +1594,60 @@ SP_VERTICAL = _controls.SP_VERTICAL
 SP_ARROW_KEYS = _controls.SP_ARROW_KEYS
 SP_WRAP = _controls.SP_WRAP
 class SpinButton(core.Control):
 SP_ARROW_KEYS = _controls.SP_ARROW_KEYS
 SP_WRAP = _controls.SP_WRAP
 class SpinButton(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSpinButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=SP_HORIZONTAL, 
+            String name=SPIN_BUTTON_NAME) -> SpinButton
+        """

         newobj = _controls.new_SpinButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_SpinButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.SpinButton_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.SpinButton_GetValue(*args, **kwargs)
-    def GetMin(*args, **kwargs): return _controls.SpinButton_GetMin(*args, **kwargs)
-    def GetMax(*args, **kwargs): return _controls.SpinButton_GetMax(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.SpinButton_SetValue(*args, **kwargs)
-    def SetMin(*args, **kwargs): return _controls.SpinButton_SetMin(*args, **kwargs)
-    def SetMax(*args, **kwargs): return _controls.SpinButton_SetMax(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.SpinButton_SetRange(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.SpinButton_IsVertical(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSpinButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=SP_HORIZONTAL, 
+            String name=SPIN_BUTTON_NAME) -> bool
+        """
+        return _controls.SpinButton_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.SpinButton_GetValue(*args, **kwargs)
+
+    def GetMin(*args, **kwargs):
+        """GetMin() -> int"""
+        return _controls.SpinButton_GetMin(*args, **kwargs)
+
+    def GetMax(*args, **kwargs):
+        """GetMax() -> int"""
+        return _controls.SpinButton_GetMax(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int val)"""
+        return _controls.SpinButton_SetValue(*args, **kwargs)
+
+    def SetMin(*args, **kwargs):
+        """SetMin(int minVal)"""
+        return _controls.SpinButton_SetMin(*args, **kwargs)
+
+    def SetMax(*args, **kwargs):
+        """SetMax(int maxVal)"""
+        return _controls.SpinButton_SetMax(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int minVal, int maxVal)"""
+        return _controls.SpinButton_SetRange(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.SpinButton_IsVertical(*args, **kwargs)
+

 
 class SpinButtonPtr(SpinButton):
     def __init__(self, this):
 
 class SpinButtonPtr(SpinButton):
     def __init__(self, this):


@@ -640,29 +1655,68 @@ class SpinButtonPtr(SpinButton):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = SpinButton
 _controls.SpinButton_swigregister(SpinButtonPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = SpinButton
 _controls.SpinButton_swigregister(SpinButtonPtr)

+SPIN_BUTTON_NAME = cvar.SPIN_BUTTON_NAME
+SpinCtrlNameStr = cvar.SpinCtrlNameStr

 
 def PreSpinButton(*args, **kwargs):
 
 def PreSpinButton(*args, **kwargs):

+    """PreSpinButton() -> SpinButton"""

     val = _controls.new_PreSpinButton(*args, **kwargs)
     val.thisown = 1
     return val
 
 class SpinCtrl(core.Control):
     val = _controls.new_PreSpinButton(*args, **kwargs)
     val.thisown = 1
     return val
 
 class SpinCtrl(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, String value=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SP_ARROW_KEYS, int min=0, int max=100, 
+            int initial=0, String name=SpinCtrlNameStr) -> SpinCtrl
+        """

         newobj = _controls.new_SpinCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_SpinCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.SpinCtrl_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.SpinCtrl_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.SpinCtrl_SetValue(*args, **kwargs)
-    def SetValueString(*args, **kwargs): return _controls.SpinCtrl_SetValueString(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.SpinCtrl_SetRange(*args, **kwargs)
-    def GetMin(*args, **kwargs): return _controls.SpinCtrl_GetMin(*args, **kwargs)
-    def GetMax(*args, **kwargs): return _controls.SpinCtrl_GetMax(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.SpinCtrl_SetSelection(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id=-1, String value=EmptyString, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SP_ARROW_KEYS, int min=0, int max=100, 
+            int initial=0, String name=SpinCtrlNameStr) -> bool
+        """
+        return _controls.SpinCtrl_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.SpinCtrl_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int value)"""
+        return _controls.SpinCtrl_SetValue(*args, **kwargs)
+
+    def SetValueString(*args, **kwargs):
+        """SetValueString(String text)"""
+        return _controls.SpinCtrl_SetValueString(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int minVal, int maxVal)"""
+        return _controls.SpinCtrl_SetRange(*args, **kwargs)
+
+    def GetMin(*args, **kwargs):
+        """GetMin() -> int"""
+        return _controls.SpinCtrl_GetMin(*args, **kwargs)
+
+    def GetMax(*args, **kwargs):
+        """GetMax() -> int"""
+        return _controls.SpinCtrl_GetMax(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(long from, long to)"""
+        return _controls.SpinCtrl_SetSelection(*args, **kwargs)
+

 
 class SpinCtrlPtr(SpinCtrl):
     def __init__(self, this):
 
 class SpinCtrlPtr(SpinCtrl):
     def __init__(self, this):


@@ -672,40 +1726,126 @@ class SpinCtrlPtr(SpinCtrl):
 _controls.SpinCtrl_swigregister(SpinCtrlPtr)
 
 def PreSpinCtrl(*args, **kwargs):
 _controls.SpinCtrl_swigregister(SpinCtrlPtr)
 
 def PreSpinCtrl(*args, **kwargs):

+    """PreSpinCtrl() -> SpinCtrl"""

     val = _controls.new_PreSpinCtrl(*args, **kwargs)
     val.thisown = 1
     return val
 
     val = _controls.new_PreSpinCtrl(*args, **kwargs)
     val.thisown = 1
     return val
 

+class SpinEvent(core.NotifyEvent):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSpinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent"""
+        newobj = _controls.new_SpinEvent(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def GetPosition(*args, **kwargs):
+        """GetPosition() -> int"""
+        return _controls.SpinEvent_GetPosition(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """SetPosition(int pos)"""
+        return _controls.SpinEvent_SetPosition(*args, **kwargs)
+
+
+class SpinEventPtr(SpinEvent):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = SpinEvent
+_controls.SpinEvent_swigregister(SpinEventPtr)
+

 wxEVT_COMMAND_SPINCTRL_UPDATED = _controls.wxEVT_COMMAND_SPINCTRL_UPDATED
 wxEVT_COMMAND_SPINCTRL_UPDATED = _controls.wxEVT_COMMAND_SPINCTRL_UPDATED

-EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
+EVT_SPIN_UP   = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1)
+EVT_SPIN_DOWN = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEDOWN, 1)
+EVT_SPIN      = wx.PyEventBinder( wx.wxEVT_SCROLL_THUMBTRACK, 1)
+EVT_SPINCTRL  = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)

 
 #---------------------------------------------------------------------------
 
 class RadioBox(core.Control):
 
 #---------------------------------------------------------------------------
 
 class RadioBox(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+            int majorDimension=0, 
+            long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
+            String name=RadioBoxNameStr) -> RadioBox
+        """
+        if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']

         newobj = _controls.new_RadioBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_RadioBox(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.RadioBox_Create(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.RadioBox_SetSelection(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.RadioBox_GetSelection(*args, **kwargs)
-    def GetStringSelection(*args, **kwargs): return _controls.RadioBox_GetStringSelection(*args, **kwargs)
-    def SetStringSelection(*args, **kwargs): return _controls.RadioBox_SetStringSelection(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _controls.RadioBox_GetCount(*args, **kwargs)
-    def FindString(*args, **kwargs): return _controls.RadioBox_FindString(*args, **kwargs)
-    def GetString(*args, **kwargs): return _controls.RadioBox_GetString(*args, **kwargs)
-    def SetString(*args, **kwargs): return _controls.RadioBox_SetString(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+            int majorDimension=0, 
+            long style=RA_HORIZONTAL, Validator validator=DefaultValidator, 
+            String name=RadioBoxNameStr) -> bool
+        """
+        return _controls.RadioBox_Create(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int n)"""
+        return _controls.RadioBox_SetSelection(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _controls.RadioBox_GetSelection(*args, **kwargs)
+
+    def GetStringSelection(*args, **kwargs):
+        """GetStringSelection() -> String"""
+        return _controls.RadioBox_GetStringSelection(*args, **kwargs)
+
+    def SetStringSelection(*args, **kwargs):
+        """SetStringSelection(String s) -> bool"""
+        return _controls.RadioBox_SetStringSelection(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> int"""
+        return _controls.RadioBox_GetCount(*args, **kwargs)
+
+    def FindString(*args, **kwargs):
+        """FindString(String s) -> int"""
+        return _controls.RadioBox_FindString(*args, **kwargs)
+
+    def GetString(*args, **kwargs):
+        """GetString(int n) -> String"""
+        return _controls.RadioBox_GetString(*args, **kwargs)
+
+    def SetString(*args, **kwargs):
+        """SetString(int n, String label)"""
+        return _controls.RadioBox_SetString(*args, **kwargs)
+

     GetItemLabel = GetString 
     SetItemLabel = SetString 
     GetItemLabel = GetString 
     SetItemLabel = SetString 

-    def EnableItem(*args, **kwargs): return _controls.RadioBox_EnableItem(*args, **kwargs)
-    def ShowItem(*args, **kwargs): return _controls.RadioBox_ShowItem(*args, **kwargs)
-    def GetColumnCount(*args, **kwargs): return _controls.RadioBox_GetColumnCount(*args, **kwargs)
-    def GetRowCount(*args, **kwargs): return _controls.RadioBox_GetRowCount(*args, **kwargs)
-    def GetNextItem(*args, **kwargs): return _controls.RadioBox_GetNextItem(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def EnableItem(*args, **kwargs):
+        """EnableItem(int n, bool enable=True)"""
+        return _controls.RadioBox_EnableItem(*args, **kwargs)
+
+    def ShowItem(*args, **kwargs):
+        """ShowItem(int n, bool show=True)"""
+        return _controls.RadioBox_ShowItem(*args, **kwargs)
+
+    def GetColumnCount(*args, **kwargs):
+        """GetColumnCount() -> int"""
+        return _controls.RadioBox_GetColumnCount(*args, **kwargs)
+
+    def GetRowCount(*args, **kwargs):
+        """GetRowCount() -> int"""
+        return _controls.RadioBox_GetRowCount(*args, **kwargs)
+
+    def GetNextItem(*args, **kwargs):
+        """GetNextItem(int item, int dir, long style) -> int"""
+        return _controls.RadioBox_GetNextItem(*args, **kwargs)
+

 
 class RadioBoxPtr(RadioBox):
     def __init__(self, this):
 
 class RadioBoxPtr(RadioBox):
     def __init__(self, this):


@@ -713,8 +1853,11 @@ class RadioBoxPtr(RadioBox):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = RadioBox
 _controls.RadioBox_swigregister(RadioBoxPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = RadioBox
 _controls.RadioBox_swigregister(RadioBoxPtr)

+RadioBoxNameStr = cvar.RadioBoxNameStr
+RadioButtonNameStr = cvar.RadioButtonNameStr

 
 def PreRadioBox(*args, **kwargs):
 
 def PreRadioBox(*args, **kwargs):

+    """PreRadioBox() -> RadioBox"""

     val = _controls.new_PreRadioBox(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreRadioBox(*args, **kwargs)
     val.thisown = 1
     return val


@@ -722,17 +1865,36 @@ def PreRadioBox(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class RadioButton(core.Control):
 #---------------------------------------------------------------------------
 
 class RadioButton(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=RadioButtonNameStr) -> RadioButton
+        """

         newobj = _controls.new_RadioButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_RadioButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.RadioButton_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.RadioButton_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.RadioButton_SetValue(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=RadioButtonNameStr) -> bool
+        """
+        return _controls.RadioButton_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> bool"""
+        return _controls.RadioButton_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(bool value)"""
+        return _controls.RadioButton_SetValue(*args, **kwargs)
+

 
 class RadioButtonPtr(RadioButton):
     def __init__(self, this):
 
 class RadioButtonPtr(RadioButton):
     def __init__(self, this):


@@ -742,6 +1904,7 @@ class RadioButtonPtr(RadioButton):
 _controls.RadioButton_swigregister(RadioButtonPtr)
 
 def PreRadioButton(*args, **kwargs):
 _controls.RadioButton_swigregister(RadioButtonPtr)
 
 def PreRadioButton(*args, **kwargs):

+    """PreRadioButton() -> RadioButton"""

     val = _controls.new_PreRadioButton(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreRadioButton(*args, **kwargs)
     val.thisown = 1
     return val


@@ -749,36 +1912,115 @@ def PreRadioButton(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class Slider(core.Control):
 #---------------------------------------------------------------------------
 
 class Slider(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSlider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, int value, int minValue, int maxValue, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
+            String name=SliderNameStr) -> Slider
+        """
+        if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']

         newobj = _controls.new_Slider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_Slider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.Slider_Create(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.Slider_GetValue(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.Slider_SetValue(*args, **kwargs)
-    def SetRange(*args, **kwargs): return _controls.Slider_SetRange(*args, **kwargs)
-    def GetMin(*args, **kwargs): return _controls.Slider_GetMin(*args, **kwargs)
-    def GetMax(*args, **kwargs): return _controls.Slider_GetMax(*args, **kwargs)
-    def SetMin(*args, **kwargs): return _controls.Slider_SetMin(*args, **kwargs)
-    def SetMax(*args, **kwargs): return _controls.Slider_SetMax(*args, **kwargs)
-    def SetLineSize(*args, **kwargs): return _controls.Slider_SetLineSize(*args, **kwargs)
-    def SetPageSize(*args, **kwargs): return _controls.Slider_SetPageSize(*args, **kwargs)
-    def GetLineSize(*args, **kwargs): return _controls.Slider_GetLineSize(*args, **kwargs)
-    def GetPageSize(*args, **kwargs): return _controls.Slider_GetPageSize(*args, **kwargs)
-    def SetThumbLength(*args, **kwargs): return _controls.Slider_SetThumbLength(*args, **kwargs)
-    def GetThumbLength(*args, **kwargs): return _controls.Slider_GetThumbLength(*args, **kwargs)
-    def SetTickFreq(*args, **kwargs): return _controls.Slider_SetTickFreq(*args, **kwargs)
-    def GetTickFreq(*args, **kwargs): return _controls.Slider_GetTickFreq(*args, **kwargs)
-    def ClearTicks(*args, **kwargs): return _controls.Slider_ClearTicks(*args, **kwargs)
-    def SetTick(*args, **kwargs): return _controls.Slider_SetTick(*args, **kwargs)
-    def ClearSel(*args, **kwargs): return _controls.Slider_ClearSel(*args, **kwargs)
-    def GetSelEnd(*args, **kwargs): return _controls.Slider_GetSelEnd(*args, **kwargs)
-    def GetSelStart(*args, **kwargs): return _controls.Slider_GetSelStart(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.Slider_SetSelection(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSlider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, int value, int minValue, int maxValue, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SL_HORIZONTAL, Validator validator=DefaultValidator, 
+            String name=SliderNameStr) -> bool
+        """
+        return _controls.Slider_Create(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> int"""
+        return _controls.Slider_GetValue(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(int value)"""
+        return _controls.Slider_SetValue(*args, **kwargs)
+
+    def SetRange(*args, **kwargs):
+        """SetRange(int minValue, int maxValue)"""
+        return _controls.Slider_SetRange(*args, **kwargs)
+
+    def GetMin(*args, **kwargs):
+        """GetMin() -> int"""
+        return _controls.Slider_GetMin(*args, **kwargs)
+
+    def GetMax(*args, **kwargs):
+        """GetMax() -> int"""
+        return _controls.Slider_GetMax(*args, **kwargs)
+
+    def SetMin(*args, **kwargs):
+        """SetMin(int minValue)"""
+        return _controls.Slider_SetMin(*args, **kwargs)
+
+    def SetMax(*args, **kwargs):
+        """SetMax(int maxValue)"""
+        return _controls.Slider_SetMax(*args, **kwargs)
+
+    def SetLineSize(*args, **kwargs):
+        """SetLineSize(int lineSize)"""
+        return _controls.Slider_SetLineSize(*args, **kwargs)
+
+    def SetPageSize(*args, **kwargs):
+        """SetPageSize(int pageSize)"""
+        return _controls.Slider_SetPageSize(*args, **kwargs)
+
+    def GetLineSize(*args, **kwargs):
+        """GetLineSize() -> int"""
+        return _controls.Slider_GetLineSize(*args, **kwargs)
+
+    def GetPageSize(*args, **kwargs):
+        """GetPageSize() -> int"""
+        return _controls.Slider_GetPageSize(*args, **kwargs)
+
+    def SetThumbLength(*args, **kwargs):
+        """SetThumbLength(int lenPixels)"""
+        return _controls.Slider_SetThumbLength(*args, **kwargs)
+
+    def GetThumbLength(*args, **kwargs):
+        """GetThumbLength() -> int"""
+        return _controls.Slider_GetThumbLength(*args, **kwargs)
+
+    def SetTickFreq(*args, **kwargs):
+        """SetTickFreq(int n, int pos=1)"""
+        return _controls.Slider_SetTickFreq(*args, **kwargs)
+
+    def GetTickFreq(*args, **kwargs):
+        """GetTickFreq() -> int"""
+        return _controls.Slider_GetTickFreq(*args, **kwargs)
+
+    def ClearTicks(*args, **kwargs):
+        """ClearTicks()"""
+        return _controls.Slider_ClearTicks(*args, **kwargs)
+
+    def SetTick(*args, **kwargs):
+        """SetTick(int tickPos)"""
+        return _controls.Slider_SetTick(*args, **kwargs)
+
+    def ClearSel(*args, **kwargs):
+        """ClearSel()"""
+        return _controls.Slider_ClearSel(*args, **kwargs)
+
+    def GetSelEnd(*args, **kwargs):
+        """GetSelEnd() -> int"""
+        return _controls.Slider_GetSelEnd(*args, **kwargs)
+
+    def GetSelStart(*args, **kwargs):
+        """GetSelStart() -> int"""
+        return _controls.Slider_GetSelStart(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int min, int max)"""
+        return _controls.Slider_SetSelection(*args, **kwargs)
+

 
 class SliderPtr(Slider):
     def __init__(self, this):
 
 class SliderPtr(Slider):
     def __init__(self, this):


@@ -786,8 +2028,10 @@ class SliderPtr(Slider):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Slider
 _controls.Slider_swigregister(SliderPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = Slider
 _controls.Slider_swigregister(SliderPtr)

+SliderNameStr = cvar.SliderNameStr

 
 def PreSlider(*args, **kwargs):
 
 def PreSlider(*args, **kwargs):

+    """PreSlider() -> Slider"""

     val = _controls.new_PreSlider(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreSlider(*args, **kwargs)
     val.thisown = 1
     return val


@@ -798,18 +2042,44 @@ wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = _controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKE
 EVT_TOGGLEBUTTON = wx.PyEventBinder( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 1)
 
 class ToggleButton(core.Control):
 EVT_TOGGLEBUTTON = wx.PyEventBinder( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 1)
 
 class ToggleButton(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=ToggleButtonNameStr) -> ToggleButton
+        """

         newobj = _controls.new_ToggleButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_ToggleButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.ToggleButton_Create(*args, **kwargs)
-    def SetValue(*args, **kwargs): return _controls.ToggleButton_SetValue(*args, **kwargs)
-    def GetValue(*args, **kwargs): return _controls.ToggleButton_GetValue(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _controls.ToggleButton_SetLabel(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, String label, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, 
+            Validator validator=DefaultValidator, String name=ToggleButtonNameStr) -> bool
+        """
+        return _controls.ToggleButton_Create(*args, **kwargs)
+
+    def SetValue(*args, **kwargs):
+        """SetValue(bool value)"""
+        return _controls.ToggleButton_SetValue(*args, **kwargs)
+
+    def GetValue(*args, **kwargs):
+        """GetValue() -> bool"""
+        return _controls.ToggleButton_GetValue(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """
+        SetLabel(String label)
+
+        Sets the item's text.
+        """
+        return _controls.ToggleButton_SetLabel(*args, **kwargs)
+

 
 class ToggleButtonPtr(ToggleButton):
     def __init__(self, this):
 
 class ToggleButtonPtr(ToggleButton):
     def __init__(self, this):


@@ -817,40 +2087,99 @@ class ToggleButtonPtr(ToggleButton):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ToggleButton
 _controls.ToggleButton_swigregister(ToggleButtonPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ToggleButton
 _controls.ToggleButton_swigregister(ToggleButtonPtr)

+ToggleButtonNameStr = cvar.ToggleButtonNameStr
+
+def PreToggleButton(*args, **kwargs):
+    """PreToggleButton() -> ToggleButton"""
+    val = _controls.new_PreToggleButton(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+#---------------------------------------------------------------------------
+
+class BookCtrl(core.Control):
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBookCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPageCount(*args, **kwargs):
+        """GetPageCount() -> size_t"""
+        return _controls.BookCtrl_GetPageCount(*args, **kwargs)
+
+    def GetPage(*args, **kwargs):
+        """GetPage(size_t n) -> Window"""
+        return _controls.BookCtrl_GetPage(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _controls.BookCtrl_GetSelection(*args, **kwargs)
+
+    def SetPageText(*args, **kwargs):
+        """SetPageText(size_t n, String strText) -> bool"""
+        return _controls.BookCtrl_SetPageText(*args, **kwargs)
+
+    def GetPageText(*args, **kwargs):
+        """GetPageText(size_t n) -> String"""
+        return _controls.BookCtrl_GetPageText(*args, **kwargs)
+
+    def SetImageList(*args, **kwargs):
+        """SetImageList(ImageList imageList)"""
+        return _controls.BookCtrl_SetImageList(*args, **kwargs)
+
+    def AssignImageList(*args, **kwargs):
+        """AssignImageList(ImageList imageList)"""
+        return _controls.BookCtrl_AssignImageList(*args, **kwargs)
+
+    def GetImageList(*args, **kwargs):
+        """GetImageList() -> ImageList"""
+        return _controls.BookCtrl_GetImageList(*args, **kwargs)
+
+    def GetPageImage(*args, **kwargs):
+        """GetPageImage(size_t n) -> int"""
+        return _controls.BookCtrl_GetPageImage(*args, **kwargs)
+
+    def SetPageImage(*args, **kwargs):
+        """SetPageImage(size_t n, int imageId) -> bool"""
+        return _controls.BookCtrl_SetPageImage(*args, **kwargs)
+
+    def SetPageSize(*args, **kwargs):
+        """SetPageSize(Size size)"""
+        return _controls.BookCtrl_SetPageSize(*args, **kwargs)
+
+    def CalcSizeFromPage(*args, **kwargs):
+        """CalcSizeFromPage(Size sizePage) -> Size"""
+        return _controls.BookCtrl_CalcSizeFromPage(*args, **kwargs)
+
+    def DeletePage(*args, **kwargs):
+        """DeletePage(size_t n) -> bool"""
+        return _controls.BookCtrl_DeletePage(*args, **kwargs)
+
+    def RemovePage(*args, **kwargs):
+        """RemovePage(size_t n) -> bool"""
+        return _controls.BookCtrl_RemovePage(*args, **kwargs)
+
+    def DeleteAllPages(*args, **kwargs):
+        """DeleteAllPages() -> bool"""
+        return _controls.BookCtrl_DeleteAllPages(*args, **kwargs)
+
+    def AddPage(*args, **kwargs):
+        """AddPage(Window page, String text, bool select=False, int imageId=-1) -> bool"""
+        return _controls.BookCtrl_AddPage(*args, **kwargs)

 
 

-def PreToggleButton(*args, **kwargs):
-    val = _controls.new_PreToggleButton(*args, **kwargs)
-    val.thisown = 1
-    return val
+    def InsertPage(*args, **kwargs):
+        """
+        InsertPage(size_t n, Window page, String text, bool select=False, 
+            int imageId=-1) -> bool
+        """
+        return _controls.BookCtrl_InsertPage(*args, **kwargs)

 
 

-#---------------------------------------------------------------------------
+    def SetSelection(*args, **kwargs):
+        """SetSelection(size_t n) -> int"""
+        return _controls.BookCtrl_SetSelection(*args, **kwargs)
+
+    def AdvanceSelection(*args, **kwargs):
+        """AdvanceSelection(bool forward=True)"""
+        return _controls.BookCtrl_AdvanceSelection(*args, **kwargs)

 
 

-class BookCtrl(core.Control):
-    def GetPageCount(*args, **kwargs): return _controls.BookCtrl_GetPageCount(*args, **kwargs)
-    def GetPage(*args, **kwargs): return _controls.BookCtrl_GetPage(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.BookCtrl_GetSelection(*args, **kwargs)
-    def SetPageText(*args, **kwargs): return _controls.BookCtrl_SetPageText(*args, **kwargs)
-    def GetPageText(*args, **kwargs): return _controls.BookCtrl_GetPageText(*args, **kwargs)
-    def SetImageList(*args, **kwargs): return _controls.BookCtrl_SetImageList(*args, **kwargs)
-    def AssignImageList(*args, **kwargs): 
-        val = _controls.BookCtrl_AssignImageList(*args, **kwargs)
-        args[1].thisown = 0
-        return val
-    def GetImageList(*args, **kwargs): return _controls.BookCtrl_GetImageList(*args, **kwargs)
-    def GetPageImage(*args, **kwargs): return _controls.BookCtrl_GetPageImage(*args, **kwargs)
-    def SetPageImage(*args, **kwargs): return _controls.BookCtrl_SetPageImage(*args, **kwargs)
-    def SetPageSize(*args, **kwargs): return _controls.BookCtrl_SetPageSize(*args, **kwargs)
-    def CalcSizeFromPage(*args, **kwargs): return _controls.BookCtrl_CalcSizeFromPage(*args, **kwargs)
-    def DeletePage(*args, **kwargs): return _controls.BookCtrl_DeletePage(*args, **kwargs)
-    def RemovePage(*args, **kwargs): return _controls.BookCtrl_RemovePage(*args, **kwargs)
-    def DeleteAllPages(*args, **kwargs): return _controls.BookCtrl_DeleteAllPages(*args, **kwargs)
-    def AddPage(*args, **kwargs): return _controls.BookCtrl_AddPage(*args, **kwargs)
-    def InsertPage(*args, **kwargs): return _controls.BookCtrl_InsertPage(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.BookCtrl_SetSelection(*args, **kwargs)
-    def AdvanceSelection(*args, **kwargs): return _controls.BookCtrl_AdvanceSelection(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBookCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 class BookCtrlPtr(BookCtrl):
     def __init__(self, this):
 
 class BookCtrlPtr(BookCtrl):
     def __init__(self, this):


@@ -858,19 +2187,36 @@ class BookCtrlPtr(BookCtrl):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = BookCtrl
 _controls.BookCtrl_swigregister(BookCtrlPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = BookCtrl
 _controls.BookCtrl_swigregister(BookCtrlPtr)

+NOTEBOOK_NAME = cvar.NOTEBOOK_NAME

 
 class BookCtrlEvent(core.NotifyEvent):
 
 class BookCtrlEvent(core.NotifyEvent):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBookCtrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+            int nOldSel=-1) -> BookCtrlEvent
+        """

         newobj = _controls.new_BookCtrlEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_BookCtrlEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def GetSelection(*args, **kwargs): return _controls.BookCtrlEvent_GetSelection(*args, **kwargs)
-    def SetSelection(*args, **kwargs): return _controls.BookCtrlEvent_SetSelection(*args, **kwargs)
-    def GetOldSelection(*args, **kwargs): return _controls.BookCtrlEvent_GetOldSelection(*args, **kwargs)
-    def SetOldSelection(*args, **kwargs): return _controls.BookCtrlEvent_SetOldSelection(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBookCtrlEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> int"""
+        return _controls.BookCtrlEvent_GetSelection(*args, **kwargs)
+
+    def SetSelection(*args, **kwargs):
+        """SetSelection(int nSel)"""
+        return _controls.BookCtrlEvent_SetSelection(*args, **kwargs)
+
+    def GetOldSelection(*args, **kwargs):
+        """GetOldSelection() -> int"""
+        return _controls.BookCtrlEvent_GetOldSelection(*args, **kwargs)
+
+    def SetOldSelection(*args, **kwargs):
+        """SetOldSelection(int nOldSel)"""
+        return _controls.BookCtrlEvent_SetOldSelection(*args, **kwargs)
+

 
 class BookCtrlEventPtr(BookCtrlEvent):
     def __init__(self, this):
 
 class BookCtrlEventPtr(BookCtrlEvent):
     def __init__(self, this):


@@ -892,20 +2238,50 @@ NB_HITTEST_ONICON = _controls.NB_HITTEST_ONICON
 NB_HITTEST_ONLABEL = _controls.NB_HITTEST_ONLABEL
 NB_HITTEST_ONITEM = _controls.NB_HITTEST_ONITEM
 class Notebook(BookCtrl):
 NB_HITTEST_ONLABEL = _controls.NB_HITTEST_ONLABEL
 NB_HITTEST_ONITEM = _controls.NB_HITTEST_ONITEM
 class Notebook(BookCtrl):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=NOTEBOOK_NAME) -> Notebook
+        """

         newobj = _controls.new_Notebook(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_Notebook(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.Notebook_Create(*args, **kwargs)
-    def GetRowCount(*args, **kwargs): return _controls.Notebook_GetRowCount(*args, **kwargs)
-    def SetPadding(*args, **kwargs): return _controls.Notebook_SetPadding(*args, **kwargs)
-    def SetTabSize(*args, **kwargs): return _controls.Notebook_SetTabSize(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.Notebook_HitTest(*args, **kwargs)
-    def CalcSizeFromPage(*args, **kwargs): return _controls.Notebook_CalcSizeFromPage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, String name=NOTEBOOK_NAME) -> bool
+        """
+        return _controls.Notebook_Create(*args, **kwargs)
+
+    def GetRowCount(*args, **kwargs):
+        """GetRowCount() -> int"""
+        return _controls.Notebook_GetRowCount(*args, **kwargs)
+
+    def SetPadding(*args, **kwargs):
+        """SetPadding(Size padding)"""
+        return _controls.Notebook_SetPadding(*args, **kwargs)
+
+    def SetTabSize(*args, **kwargs):
+        """SetTabSize(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 CalcSizeFromPage(*args, **kwargs):
+        """CalcSizeFromPage(Size sizePage) -> Size"""
+        return _controls.Notebook_CalcSizeFromPage(*args, **kwargs)
+

 
 class NotebookPtr(Notebook):
     def __init__(self, this):
 
 class NotebookPtr(Notebook):
     def __init__(self, this):


@@ -915,18 +2291,23 @@ class NotebookPtr(Notebook):
 _controls.Notebook_swigregister(NotebookPtr)
 
 def PreNotebook(*args, **kwargs):
 _controls.Notebook_swigregister(NotebookPtr)
 
 def PreNotebook(*args, **kwargs):

+    """PreNotebook() -> Notebook"""

     val = _controls.new_PreNotebook(*args, **kwargs)
     val.thisown = 1
     return val
 
 class NotebookEvent(BookCtrlEvent):
     val = _controls.new_PreNotebook(*args, **kwargs)
     val.thisown = 1
     return val
 
 class NotebookEvent(BookCtrlEvent):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNotebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+            int nOldSel=-1) -> NotebookEvent
+        """

         newobj = _controls.new_NotebookEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_NotebookEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 class NotebookEventPtr(NotebookEvent):
     def __init__(self, this):
 
 class NotebookEventPtr(NotebookEvent):
     def __init__(self, this):


@@ -980,16 +2361,30 @@ LB_LEFT = _controls.LB_LEFT
 LB_RIGHT = _controls.LB_RIGHT
 LB_ALIGN_MASK = _controls.LB_ALIGN_MASK
 class Listbook(BookCtrl):
 LB_RIGHT = _controls.LB_RIGHT
 LB_ALIGN_MASK = _controls.LB_ALIGN_MASK
 class Listbook(BookCtrl):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=EmptyString) -> Listbook
+        """

         newobj = _controls.new_Listbook(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_Listbook(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.Listbook_Create(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.Listbook_IsVertical(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, String name=EmptyString) -> bool
+        """
+        return _controls.Listbook_Create(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.Listbook_IsVertical(*args, **kwargs)
+

 
 class ListbookPtr(Listbook):
     def __init__(self, this):
 
 class ListbookPtr(Listbook):
     def __init__(self, this):


@@ -999,18 +2394,23 @@ class ListbookPtr(Listbook):
 _controls.Listbook_swigregister(ListbookPtr)
 
 def PreListbook(*args, **kwargs):
 _controls.Listbook_swigregister(ListbookPtr)
 
 def PreListbook(*args, **kwargs):

+    """PreListbook() -> Listbook"""

     val = _controls.new_PreListbook(*args, **kwargs)
     val.thisown = 1
     return val
 
 class ListbookEvent(BookCtrlEvent):
     val = _controls.new_PreListbook(*args, **kwargs)
     val.thisown = 1
     return val
 
 class ListbookEvent(BookCtrlEvent):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1, 
+            int nOldSel=-1) -> ListbookEvent
+        """

         newobj = _controls.new_ListbookEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_ListbookEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 class ListbookEventPtr(ListbookEvent):
     def __init__(self, this):
 
 class ListbookEventPtr(ListbookEvent):
     def __init__(self, this):


@@ -1027,17 +2427,28 @@ EVT_LISTBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_LISTBOOK_PAGE_CHANG
 #---------------------------------------------------------------------------
 
 class BookCtrlSizer(core.Sizer):
 #---------------------------------------------------------------------------
 
 class BookCtrlSizer(core.Sizer):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__(BookCtrl nb) -> BookCtrlSizer"""

         newobj = _controls.new_BookCtrlSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_BookCtrlSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def RecalcSizes(*args, **kwargs): return _controls.BookCtrlSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _controls.BookCtrlSizer_CalcMin(*args, **kwargs)
-    def GetControl(*args, **kwargs): return _controls.BookCtrlSizer_GetControl(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _controls.BookCtrlSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _controls.BookCtrlSizer_CalcMin(*args, **kwargs)
+
+    def GetControl(*args, **kwargs):
+        """GetControl() -> BookCtrl"""
+        return _controls.BookCtrlSizer_GetControl(*args, **kwargs)
+

 
 class BookCtrlSizerPtr(BookCtrlSizer):
     def __init__(self, this):
 
 class BookCtrlSizerPtr(BookCtrlSizer):
     def __init__(self, this):


@@ -1047,17 +2458,28 @@ class BookCtrlSizerPtr(BookCtrlSizer):
 _controls.BookCtrlSizer_swigregister(BookCtrlSizerPtr)
 
 class NotebookSizer(core.Sizer):
 _controls.BookCtrlSizer_swigregister(BookCtrlSizerPtr)
 
 class NotebookSizer(core.Sizer):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__(Notebook nb) -> NotebookSizer"""

         newobj = _controls.new_NotebookSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_NotebookSizer(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def RecalcSizes(*args, **kwargs): return _controls.NotebookSizer_RecalcSizes(*args, **kwargs)
-    def CalcMin(*args, **kwargs): return _controls.NotebookSizer_CalcMin(*args, **kwargs)
-    def GetNotebook(*args, **kwargs): return _controls.NotebookSizer_GetNotebook(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def RecalcSizes(*args, **kwargs):
+        """RecalcSizes()"""
+        return _controls.NotebookSizer_RecalcSizes(*args, **kwargs)
+
+    def CalcMin(*args, **kwargs):
+        """CalcMin() -> Size"""
+        return _controls.NotebookSizer_CalcMin(*args, **kwargs)
+
+    def GetNotebook(*args, **kwargs):
+        """GetNotebook() -> Notebook"""
+        return _controls.NotebookSizer_GetNotebook(*args, **kwargs)
+

 
 class NotebookSizerPtr(NotebookSizer):
     def __init__(self, this):
 
 class NotebookSizerPtr(NotebookSizer):
     def __init__(self, this):


@@ -1083,43 +2505,130 @@ TB_NOALIGN = _controls.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls.TB_HORZ_TEXT
 class ToolBarToolBase(core.Object):
 TB_HORZ_LAYOUT = _controls.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls.TB_HORZ_TEXT
 class ToolBarToolBase(core.Object):

-    def GetId(*args, **kwargs): return _controls.ToolBarToolBase_GetId(*args, **kwargs)
-    def GetControl(*args, **kwargs): return _controls.ToolBarToolBase_GetControl(*args, **kwargs)
-    def GetToolBar(*args, **kwargs): return _controls.ToolBarToolBase_GetToolBar(*args, **kwargs)
-    def IsButton(*args, **kwargs): return _controls.ToolBarToolBase_IsButton(*args, **kwargs)
-    def IsControl(*args, **kwargs): return _controls.ToolBarToolBase_IsControl(*args, **kwargs)
-    def IsSeparator(*args, **kwargs): return _controls.ToolBarToolBase_IsSeparator(*args, **kwargs)
-    def GetStyle(*args, **kwargs): return _controls.ToolBarToolBase_GetStyle(*args, **kwargs)
-    def GetKind(*args, **kwargs): return _controls.ToolBarToolBase_GetKind(*args, **kwargs)
-    def IsEnabled(*args, **kwargs): return _controls.ToolBarToolBase_IsEnabled(*args, **kwargs)
-    def IsToggled(*args, **kwargs): return _controls.ToolBarToolBase_IsToggled(*args, **kwargs)
-    def CanBeToggled(*args, **kwargs): return _controls.ToolBarToolBase_CanBeToggled(*args, **kwargs)
-    def GetNormalBitmap(*args, **kwargs): return _controls.ToolBarToolBase_GetNormalBitmap(*args, **kwargs)
-    def GetDisabledBitmap(*args, **kwargs): return _controls.ToolBarToolBase_GetDisabledBitmap(*args, **kwargs)
-    def GetBitmap(*args, **kwargs): return _controls.ToolBarToolBase_GetBitmap(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _controls.ToolBarToolBase_GetLabel(*args, **kwargs)
-    def GetShortHelp(*args, **kwargs): return _controls.ToolBarToolBase_GetShortHelp(*args, **kwargs)
-    def GetLongHelp(*args, **kwargs): return _controls.ToolBarToolBase_GetLongHelp(*args, **kwargs)
-    def Enable(*args, **kwargs): return _controls.ToolBarToolBase_Enable(*args, **kwargs)
-    def Toggle(*args, **kwargs): return _controls.ToolBarToolBase_Toggle(*args, **kwargs)
-    def SetToggle(*args, **kwargs): return _controls.ToolBarToolBase_SetToggle(*args, **kwargs)
-    def SetShortHelp(*args, **kwargs): return _controls.ToolBarToolBase_SetShortHelp(*args, **kwargs)
-    def SetLongHelp(*args, **kwargs): return _controls.ToolBarToolBase_SetLongHelp(*args, **kwargs)
-    def SetNormalBitmap(*args, **kwargs): return _controls.ToolBarToolBase_SetNormalBitmap(*args, **kwargs)
-    def SetDisabledBitmap(*args, **kwargs): return _controls.ToolBarToolBase_SetDisabledBitmap(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _controls.ToolBarToolBase_SetLabel(*args, **kwargs)
-    def Detach(*args, **kwargs): return _controls.ToolBarToolBase_Detach(*args, **kwargs)
-    def Attach(*args, **kwargs): return _controls.ToolBarToolBase_Attach(*args, **kwargs)
-    def GetClientData(*args, **kwargs): return _controls.ToolBarToolBase_GetClientData(*args, **kwargs)
-    def SetClientData(*args, **kwargs): return _controls.ToolBarToolBase_SetClientData(*args, **kwargs)
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToolBarToolBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetId(*args, **kwargs):
+        """GetId() -> int"""
+        return _controls.ToolBarToolBase_GetId(*args, **kwargs)
+
+    def GetControl(*args, **kwargs):
+        """GetControl() -> Control"""
+        return _controls.ToolBarToolBase_GetControl(*args, **kwargs)
+
+    def GetToolBar(*args, **kwargs):
+        """GetToolBar() -> ToolBarBase"""
+        return _controls.ToolBarToolBase_GetToolBar(*args, **kwargs)
+
+    def IsButton(*args, **kwargs):
+        """IsButton() -> int"""
+        return _controls.ToolBarToolBase_IsButton(*args, **kwargs)
+
+    def IsControl(*args, **kwargs):
+        """IsControl() -> int"""
+        return _controls.ToolBarToolBase_IsControl(*args, **kwargs)
+
+    def IsSeparator(*args, **kwargs):
+        """IsSeparator() -> int"""
+        return _controls.ToolBarToolBase_IsSeparator(*args, **kwargs)
+
+    def GetStyle(*args, **kwargs):
+        """GetStyle() -> int"""
+        return _controls.ToolBarToolBase_GetStyle(*args, **kwargs)
+
+    def GetKind(*args, **kwargs):
+        """GetKind() -> int"""
+        return _controls.ToolBarToolBase_GetKind(*args, **kwargs)
+
+    def IsEnabled(*args, **kwargs):
+        """IsEnabled() -> bool"""
+        return _controls.ToolBarToolBase_IsEnabled(*args, **kwargs)
+
+    def IsToggled(*args, **kwargs):
+        """IsToggled() -> bool"""
+        return _controls.ToolBarToolBase_IsToggled(*args, **kwargs)
+
+    def CanBeToggled(*args, **kwargs):
+        """CanBeToggled() -> bool"""
+        return _controls.ToolBarToolBase_CanBeToggled(*args, **kwargs)
+
+    def GetNormalBitmap(*args, **kwargs):
+        """GetNormalBitmap() -> Bitmap"""
+        return _controls.ToolBarToolBase_GetNormalBitmap(*args, **kwargs)
+
+    def GetDisabledBitmap(*args, **kwargs):
+        """GetDisabledBitmap() -> Bitmap"""
+        return _controls.ToolBarToolBase_GetDisabledBitmap(*args, **kwargs)
+
+    def GetBitmap(*args, **kwargs):
+        """GetBitmap() -> Bitmap"""
+        return _controls.ToolBarToolBase_GetBitmap(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> String"""
+        return _controls.ToolBarToolBase_GetLabel(*args, **kwargs)
+
+    def GetShortHelp(*args, **kwargs):
+        """GetShortHelp() -> String"""
+        return _controls.ToolBarToolBase_GetShortHelp(*args, **kwargs)
+
+    def GetLongHelp(*args, **kwargs):
+        """GetLongHelp() -> String"""
+        return _controls.ToolBarToolBase_GetLongHelp(*args, **kwargs)
+
+    def Enable(*args, **kwargs):
+        """Enable(bool enable) -> bool"""
+        return _controls.ToolBarToolBase_Enable(*args, **kwargs)
+
+    def Toggle(*args, **kwargs):
+        """Toggle()"""
+        return _controls.ToolBarToolBase_Toggle(*args, **kwargs)
+
+    def SetToggle(*args, **kwargs):
+        """SetToggle(bool toggle) -> bool"""
+        return _controls.ToolBarToolBase_SetToggle(*args, **kwargs)
+
+    def SetShortHelp(*args, **kwargs):
+        """SetShortHelp(String help) -> bool"""
+        return _controls.ToolBarToolBase_SetShortHelp(*args, **kwargs)
+
+    def SetLongHelp(*args, **kwargs):
+        """SetLongHelp(String help) -> bool"""
+        return _controls.ToolBarToolBase_SetLongHelp(*args, **kwargs)
+
+    def SetNormalBitmap(*args, **kwargs):
+        """SetNormalBitmap(Bitmap bmp)"""
+        return _controls.ToolBarToolBase_SetNormalBitmap(*args, **kwargs)
+
+    def SetDisabledBitmap(*args, **kwargs):
+        """SetDisabledBitmap(Bitmap bmp)"""
+        return _controls.ToolBarToolBase_SetDisabledBitmap(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(String label)"""
+        return _controls.ToolBarToolBase_SetLabel(*args, **kwargs)
+
+    def Detach(*args, **kwargs):
+        """Detach()"""
+        return _controls.ToolBarToolBase_Detach(*args, **kwargs)
+
+    def Attach(*args, **kwargs):
+        """Attach(ToolBarBase tbar)"""
+        return _controls.ToolBarToolBase_Attach(*args, **kwargs)
+
+    def GetClientData(*args, **kwargs):
+        """GetClientData() -> PyObject"""
+        return _controls.ToolBarToolBase_GetClientData(*args, **kwargs)
+
+    def SetClientData(*args, **kwargs):
+        """SetClientData(PyObject clientData)"""
+        return _controls.ToolBarToolBase_SetClientData(*args, **kwargs)
+

     GetBitmap1 = GetNormalBitmap
     GetBitmap2 = GetDisabledBitmap
     SetBitmap1 = SetNormalBitmap
     SetBitmap2 = SetDisabledBitmap
 
     GetBitmap1 = GetNormalBitmap
     GetBitmap2 = GetDisabledBitmap
     SetBitmap1 = SetNormalBitmap
     SetBitmap2 = SetDisabledBitmap
 

-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolBarToolBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 class ToolBarToolBasePtr(ToolBarToolBase):
     def __init__(self, this):
 
 class ToolBarToolBasePtr(ToolBarToolBase):
     def __init__(self, this):


@@ -1129,8 +2638,27 @@ class ToolBarToolBasePtr(ToolBarToolBase):
 _controls.ToolBarToolBase_swigregister(ToolBarToolBasePtr)
 
 class ToolBarBase(core.Control):
 _controls.ToolBarToolBase_swigregister(ToolBarToolBasePtr)
 
 class ToolBarBase(core.Control):

-    def DoAddTool(*args, **kwargs): return _controls.ToolBarBase_DoAddTool(*args, **kwargs)
-    def DoInsertTool(*args, **kwargs): return _controls.ToolBarBase_DoInsertTool(*args, **kwargs)
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToolBarBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def DoAddTool(*args, **kwargs):
+        """
+        DoAddTool(int id, String label, Bitmap bitmap, Bitmap bmpDisabled=wxNullBitmap, 
+            int kind=ITEM_NORMAL, String shortHelp=EmptyString, 
+            String longHelp=EmptyString, 
+            PyObject clientData=None) -> ToolBarToolBase
+        """
+        return _controls.ToolBarBase_DoAddTool(*args, **kwargs)
+
+    def DoInsertTool(*args, **kwargs):
+        """
+        DoInsertTool(size_t pos, int id, String label, Bitmap bitmap, Bitmap bmpDisabled=wxNullBitmap, 
+            int kind=ITEM_NORMAL, 
+            String shortHelp=EmptyString, String longHelp=EmptyString, 
+            PyObject clientData=None) -> ToolBarToolBase
+        """
+        return _controls.ToolBarBase_DoInsertTool(*args, **kwargs)
+

     # These match the original Add methods for this class, kept for
     # backwards compatibility with versions < 2.3.3.
 
     # These match the original Add methods for this class, kept for
     # backwards compatibility with versions < 2.3.3.
 


@@ -1254,48 +2782,174 @@ class ToolBarBase(core.Control):
         return self.DoAddTool(id, '', bitmap, bmpDisabled, wx.ITEM_RADIO,
                               shortHelp, longHelp, clientData)
 
         return self.DoAddTool(id, '', bitmap, bmpDisabled, wx.ITEM_RADIO,
                               shortHelp, longHelp, clientData)
 

-    def AddControl(*args, **kwargs): return _controls.ToolBarBase_AddControl(*args, **kwargs)
-    def InsertControl(*args, **kwargs): return _controls.ToolBarBase_InsertControl(*args, **kwargs)
-    def FindControl(*args, **kwargs): return _controls.ToolBarBase_FindControl(*args, **kwargs)
-    def AddSeparator(*args, **kwargs): return _controls.ToolBarBase_AddSeparator(*args, **kwargs)
-    def InsertSeparator(*args, **kwargs): return _controls.ToolBarBase_InsertSeparator(*args, **kwargs)
-    def RemoveTool(*args, **kwargs): return _controls.ToolBarBase_RemoveTool(*args, **kwargs)
-    def DeleteToolByPos(*args, **kwargs): return _controls.ToolBarBase_DeleteToolByPos(*args, **kwargs)
-    def DeleteTool(*args, **kwargs): return _controls.ToolBarBase_DeleteTool(*args, **kwargs)
-    def ClearTools(*args, **kwargs): return _controls.ToolBarBase_ClearTools(*args, **kwargs)
-    def Realize(*args, **kwargs): return _controls.ToolBarBase_Realize(*args, **kwargs)
-    def EnableTool(*args, **kwargs): return _controls.ToolBarBase_EnableTool(*args, **kwargs)
-    def ToggleTool(*args, **kwargs): return _controls.ToolBarBase_ToggleTool(*args, **kwargs)
-    def SetToggle(*args, **kwargs): return _controls.ToolBarBase_SetToggle(*args, **kwargs)
-    def GetToolClientData(*args, **kwargs): return _controls.ToolBarBase_GetToolClientData(*args, **kwargs)
-    def SetToolClientData(*args, **kwargs): return _controls.ToolBarBase_SetToolClientData(*args, **kwargs)
-    def GetToolPos(*args, **kwargs): return _controls.ToolBarBase_GetToolPos(*args, **kwargs)
-    def GetToolState(*args, **kwargs): return _controls.ToolBarBase_GetToolState(*args, **kwargs)
-    def GetToolEnabled(*args, **kwargs): return _controls.ToolBarBase_GetToolEnabled(*args, **kwargs)
-    def SetToolShortHelp(*args, **kwargs): return _controls.ToolBarBase_SetToolShortHelp(*args, **kwargs)
-    def GetToolShortHelp(*args, **kwargs): return _controls.ToolBarBase_GetToolShortHelp(*args, **kwargs)
-    def SetToolLongHelp(*args, **kwargs): return _controls.ToolBarBase_SetToolLongHelp(*args, **kwargs)
-    def GetToolLongHelp(*args, **kwargs): return _controls.ToolBarBase_GetToolLongHelp(*args, **kwargs)
-    def SetMarginsXY(*args, **kwargs): return _controls.ToolBarBase_SetMarginsXY(*args, **kwargs)
-    def SetMargins(*args, **kwargs): return _controls.ToolBarBase_SetMargins(*args, **kwargs)
-    def SetToolPacking(*args, **kwargs): return _controls.ToolBarBase_SetToolPacking(*args, **kwargs)
-    def SetToolSeparation(*args, **kwargs): return _controls.ToolBarBase_SetToolSeparation(*args, **kwargs)
-    def GetToolMargins(*args, **kwargs): return _controls.ToolBarBase_GetToolMargins(*args, **kwargs)
-    def GetMargins(*args, **kwargs): return _controls.ToolBarBase_GetMargins(*args, **kwargs)
-    def GetToolPacking(*args, **kwargs): return _controls.ToolBarBase_GetToolPacking(*args, **kwargs)
-    def GetToolSeparation(*args, **kwargs): return _controls.ToolBarBase_GetToolSeparation(*args, **kwargs)
-    def SetRows(*args, **kwargs): return _controls.ToolBarBase_SetRows(*args, **kwargs)
-    def SetMaxRowsCols(*args, **kwargs): return _controls.ToolBarBase_SetMaxRowsCols(*args, **kwargs)
-    def GetMaxRows(*args, **kwargs): return _controls.ToolBarBase_GetMaxRows(*args, **kwargs)
-    def GetMaxCols(*args, **kwargs): return _controls.ToolBarBase_GetMaxCols(*args, **kwargs)
-    def SetToolBitmapSize(*args, **kwargs): return _controls.ToolBarBase_SetToolBitmapSize(*args, **kwargs)
-    def GetToolBitmapSize(*args, **kwargs): return _controls.ToolBarBase_GetToolBitmapSize(*args, **kwargs)
-    def GetToolSize(*args, **kwargs): return _controls.ToolBarBase_GetToolSize(*args, **kwargs)
-    def FindToolForPosition(*args, **kwargs): return _controls.ToolBarBase_FindToolForPosition(*args, **kwargs)
-    def IsVertical(*args, **kwargs): return _controls.ToolBarBase_IsVertical(*args, **kwargs)
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolBarBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def AddToolItem(*args, **kwargs):
+        """AddToolItem(ToolBarToolBase tool) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_AddToolItem(*args, **kwargs)
+
+    def InsertToolItem(*args, **kwargs):
+        """InsertToolItem(size_t pos, ToolBarToolBase tool) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_InsertToolItem(*args, **kwargs)
+
+    def AddControl(*args, **kwargs):
+        """AddControl(Control control) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_AddControl(*args, **kwargs)
+
+    def InsertControl(*args, **kwargs):
+        """InsertControl(size_t pos, Control control) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_InsertControl(*args, **kwargs)
+
+    def FindControl(*args, **kwargs):
+        """FindControl(int id) -> Control"""
+        return _controls.ToolBarBase_FindControl(*args, **kwargs)
+
+    def AddSeparator(*args, **kwargs):
+        """AddSeparator() -> ToolBarToolBase"""
+        return _controls.ToolBarBase_AddSeparator(*args, **kwargs)
+
+    def InsertSeparator(*args, **kwargs):
+        """InsertSeparator(size_t pos) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_InsertSeparator(*args, **kwargs)
+
+    def RemoveTool(*args, **kwargs):
+        """RemoveTool(int id) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_RemoveTool(*args, **kwargs)
+
+    def DeleteToolByPos(*args, **kwargs):
+        """DeleteToolByPos(size_t pos) -> bool"""
+        return _controls.ToolBarBase_DeleteToolByPos(*args, **kwargs)
+
+    def DeleteTool(*args, **kwargs):
+        """DeleteTool(int id) -> bool"""
+        return _controls.ToolBarBase_DeleteTool(*args, **kwargs)
+
+    def ClearTools(*args, **kwargs):
+        """ClearTools()"""
+        return _controls.ToolBarBase_ClearTools(*args, **kwargs)
+
+    def Realize(*args, **kwargs):
+        """Realize() -> bool"""
+        return _controls.ToolBarBase_Realize(*args, **kwargs)
+
+    def EnableTool(*args, **kwargs):
+        """EnableTool(int id, bool enable)"""
+        return _controls.ToolBarBase_EnableTool(*args, **kwargs)
+
+    def ToggleTool(*args, **kwargs):
+        """ToggleTool(int id, bool toggle)"""
+        return _controls.ToolBarBase_ToggleTool(*args, **kwargs)
+
+    def SetToggle(*args, **kwargs):
+        """SetToggle(int id, bool toggle)"""
+        return _controls.ToolBarBase_SetToggle(*args, **kwargs)
+
+    def GetToolClientData(*args, **kwargs):
+        """GetToolClientData(int id) -> PyObject"""
+        return _controls.ToolBarBase_GetToolClientData(*args, **kwargs)
+
+    def SetToolClientData(*args, **kwargs):
+        """SetToolClientData(int id, PyObject clientData)"""
+        return _controls.ToolBarBase_SetToolClientData(*args, **kwargs)
+
+    def GetToolPos(*args, **kwargs):
+        """GetToolPos(int id) -> int"""
+        return _controls.ToolBarBase_GetToolPos(*args, **kwargs)
+
+    def GetToolState(*args, **kwargs):
+        """GetToolState(int id) -> bool"""
+        return _controls.ToolBarBase_GetToolState(*args, **kwargs)
+
+    def GetToolEnabled(*args, **kwargs):
+        """GetToolEnabled(int id) -> bool"""
+        return _controls.ToolBarBase_GetToolEnabled(*args, **kwargs)
+
+    def SetToolShortHelp(*args, **kwargs):
+        """SetToolShortHelp(int id, String helpString)"""
+        return _controls.ToolBarBase_SetToolShortHelp(*args, **kwargs)
+
+    def GetToolShortHelp(*args, **kwargs):
+        """GetToolShortHelp(int id) -> String"""
+        return _controls.ToolBarBase_GetToolShortHelp(*args, **kwargs)
+
+    def SetToolLongHelp(*args, **kwargs):
+        """SetToolLongHelp(int id, String helpString)"""
+        return _controls.ToolBarBase_SetToolLongHelp(*args, **kwargs)
+
+    def GetToolLongHelp(*args, **kwargs):
+        """GetToolLongHelp(int id) -> String"""
+        return _controls.ToolBarBase_GetToolLongHelp(*args, **kwargs)
+
+    def SetMarginsXY(*args, **kwargs):
+        """SetMarginsXY(int x, int y)"""
+        return _controls.ToolBarBase_SetMarginsXY(*args, **kwargs)
+
+    def SetMargins(*args, **kwargs):
+        """SetMargins(Size size)"""
+        return _controls.ToolBarBase_SetMargins(*args, **kwargs)
+
+    def SetToolPacking(*args, **kwargs):
+        """SetToolPacking(int packing)"""
+        return _controls.ToolBarBase_SetToolPacking(*args, **kwargs)
+
+    def SetToolSeparation(*args, **kwargs):
+        """SetToolSeparation(int separation)"""
+        return _controls.ToolBarBase_SetToolSeparation(*args, **kwargs)
+
+    def GetToolMargins(*args, **kwargs):
+        """GetToolMargins() -> Size"""
+        return _controls.ToolBarBase_GetToolMargins(*args, **kwargs)
+
+    def GetMargins(*args, **kwargs):
+        """GetMargins() -> Size"""
+        return _controls.ToolBarBase_GetMargins(*args, **kwargs)
+
+    def GetToolPacking(*args, **kwargs):
+        """GetToolPacking() -> int"""
+        return _controls.ToolBarBase_GetToolPacking(*args, **kwargs)
+
+    def GetToolSeparation(*args, **kwargs):
+        """GetToolSeparation() -> int"""
+        return _controls.ToolBarBase_GetToolSeparation(*args, **kwargs)
+
+    def SetRows(*args, **kwargs):
+        """SetRows(int nRows)"""
+        return _controls.ToolBarBase_SetRows(*args, **kwargs)
+
+    def SetMaxRowsCols(*args, **kwargs):
+        """SetMaxRowsCols(int rows, int cols)"""
+        return _controls.ToolBarBase_SetMaxRowsCols(*args, **kwargs)
+
+    def GetMaxRows(*args, **kwargs):
+        """GetMaxRows() -> int"""
+        return _controls.ToolBarBase_GetMaxRows(*args, **kwargs)
+
+    def GetMaxCols(*args, **kwargs):
+        """GetMaxCols() -> int"""
+        return _controls.ToolBarBase_GetMaxCols(*args, **kwargs)
+
+    def SetToolBitmapSize(*args, **kwargs):
+        """SetToolBitmapSize(Size size)"""
+        return _controls.ToolBarBase_SetToolBitmapSize(*args, **kwargs)
+
+    def GetToolBitmapSize(*args, **kwargs):
+        """GetToolBitmapSize() -> Size"""
+        return _controls.ToolBarBase_GetToolBitmapSize(*args, **kwargs)
+
+    def GetToolSize(*args, **kwargs):
+        """GetToolSize() -> Size"""
+        return _controls.ToolBarBase_GetToolSize(*args, **kwargs)
+
+    def FindToolForPosition(*args, **kwargs):
+        """FindToolForPosition(int x, int y) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_FindToolForPosition(*args, **kwargs)
+
+    def FindById(*args, **kwargs):
+        """FindById(int toolid) -> ToolBarToolBase"""
+        return _controls.ToolBarBase_FindById(*args, **kwargs)
+
+    def IsVertical(*args, **kwargs):
+        """IsVertical() -> bool"""
+        return _controls.ToolBarBase_IsVertical(*args, **kwargs)
+

 
 class ToolBarBasePtr(ToolBarBase):
     def __init__(self, this):
 
 class ToolBarBasePtr(ToolBarBase):
     def __init__(self, this):


@@ -1305,16 +2959,32 @@ class ToolBarBasePtr(ToolBarBase):
 _controls.ToolBarBase_swigregister(ToolBarBasePtr)
 
 class ToolBar(ToolBarBase):
 _controls.ToolBarBase_swigregister(ToolBarBasePtr)
 
 class ToolBar(ToolBarBase):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxToolBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxNO_BORDER|wxTB_HORIZONTAL, 
+            String name=wxPyToolBarNameStr) -> ToolBar
+        """

         newobj = _controls.new_ToolBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_ToolBar(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.ToolBar_Create(*args, **kwargs)
-    def FindToolForPosition(*args, **kwargs): return _controls.ToolBar_FindToolForPosition(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxNO_BORDER|wxTB_HORIZONTAL, 
+            String name=wxPyToolBarNameStr) -> bool
+        """
+        return _controls.ToolBar_Create(*args, **kwargs)
+
+    def FindToolForPosition(*args, **kwargs):
+        """FindToolForPosition(int x, int y) -> ToolBarToolBase"""
+        return _controls.ToolBar_FindToolForPosition(*args, **kwargs)
+

 
 class ToolBarPtr(ToolBar):
     def __init__(self, this):
 
 class ToolBarPtr(ToolBar):
     def __init__(self, this):


@@ -1324,6 +2994,7 @@ class ToolBarPtr(ToolBar):
 _controls.ToolBar_swigregister(ToolBarPtr)
 
 def PreToolBar(*args, **kwargs):
 _controls.ToolBar_swigregister(ToolBarPtr)
 
 def PreToolBar(*args, **kwargs):

+    """PreToolBar() -> ToolBar"""

     val = _controls.new_PreToolBar(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreToolBar(*args, **kwargs)
     val.thisown = 1
     return val


@@ -1401,23 +3072,57 @@ LIST_FIND_RIGHT = _controls.LIST_FIND_RIGHT
 #---------------------------------------------------------------------------
 
 class ListItemAttr(object):
 #---------------------------------------------------------------------------
 
 class ListItemAttr(object):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Colour colText=wxNullColour, Colour colBack=wxNullColour, 
+            Font font=wxNullFont) -> ListItemAttr
+        """

         newobj = _controls.new_ListItemAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_ListItemAttr(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def SetTextColour(*args, **kwargs): return _controls.ListItemAttr_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.ListItemAttr_SetBackgroundColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _controls.ListItemAttr_SetFont(*args, **kwargs)
-    def HasTextColour(*args, **kwargs): return _controls.ListItemAttr_HasTextColour(*args, **kwargs)
-    def HasBackgroundColour(*args, **kwargs): return _controls.ListItemAttr_HasBackgroundColour(*args, **kwargs)
-    def HasFont(*args, **kwargs): return _controls.ListItemAttr_HasFont(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.ListItemAttr_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _controls.ListItemAttr_GetBackgroundColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _controls.ListItemAttr_GetFont(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _controls.ListItemAttr_Destroy(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListItemAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(Colour colText)"""
+        return _controls.ListItemAttr_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(Colour colBack)"""
+        return _controls.ListItemAttr_SetBackgroundColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(Font font)"""
+        return _controls.ListItemAttr_SetFont(*args, **kwargs)
+
+    def HasTextColour(*args, **kwargs):
+        """HasTextColour() -> bool"""
+        return _controls.ListItemAttr_HasTextColour(*args, **kwargs)
+
+    def HasBackgroundColour(*args, **kwargs):
+        """HasBackgroundColour() -> bool"""
+        return _controls.ListItemAttr_HasBackgroundColour(*args, **kwargs)
+
+    def HasFont(*args, **kwargs):
+        """HasFont() -> bool"""
+        return _controls.ListItemAttr_HasFont(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> Colour"""
+        return _controls.ListItemAttr_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> Colour"""
+        return _controls.ListItemAttr_GetBackgroundColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> Font"""
+        return _controls.ListItemAttr_GetFont(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _controls.ListItemAttr_Destroy(*args, **kwargs)
+

 
 class ListItemAttrPtr(ListItemAttr):
     def __init__(self, this):
 
 class ListItemAttrPtr(ListItemAttr):
     def __init__(self, this):


@@ -1425,48 +3130,141 @@ class ListItemAttrPtr(ListItemAttr):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ListItemAttr
 _controls.ListItemAttr_swigregister(ListItemAttrPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = ListItemAttr
 _controls.ListItemAttr_swigregister(ListItemAttrPtr)

+ListCtrlNameStr = cvar.ListCtrlNameStr

 
 #---------------------------------------------------------------------------
 
 class ListItem(core.Object):
 
 #---------------------------------------------------------------------------
 
 class ListItem(core.Object):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__() -> ListItem"""

         newobj = _controls.new_ListItem(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_ListItem):
         newobj = _controls.new_ListItem(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_ListItem):

+        """__del__()"""

         try:
             if self.thisown: destroy(self)
         except: pass
         try:
             if self.thisown: destroy(self)
         except: pass

-    def Clear(*args, **kwargs): return _controls.ListItem_Clear(*args, **kwargs)
-    def ClearAttributes(*args, **kwargs): return _controls.ListItem_ClearAttributes(*args, **kwargs)
-    def SetMask(*args, **kwargs): return _controls.ListItem_SetMask(*args, **kwargs)
-    def SetId(*args, **kwargs): return _controls.ListItem_SetId(*args, **kwargs)
-    def SetColumn(*args, **kwargs): return _controls.ListItem_SetColumn(*args, **kwargs)
-    def SetState(*args, **kwargs): return _controls.ListItem_SetState(*args, **kwargs)
-    def SetStateMask(*args, **kwargs): return _controls.ListItem_SetStateMask(*args, **kwargs)
-    def SetText(*args, **kwargs): return _controls.ListItem_SetText(*args, **kwargs)
-    def SetImage(*args, **kwargs): return _controls.ListItem_SetImage(*args, **kwargs)
-    def SetData(*args, **kwargs): return _controls.ListItem_SetData(*args, **kwargs)
-    def SetWidth(*args, **kwargs): return _controls.ListItem_SetWidth(*args, **kwargs)
-    def SetAlign(*args, **kwargs): return _controls.ListItem_SetAlign(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _controls.ListItem_SetTextColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.ListItem_SetBackgroundColour(*args, **kwargs)
-    def SetFont(*args, **kwargs): return _controls.ListItem_SetFont(*args, **kwargs)
-    def GetMask(*args, **kwargs): return _controls.ListItem_GetMask(*args, **kwargs)
-    def GetId(*args, **kwargs): return _controls.ListItem_GetId(*args, **kwargs)
-    def GetColumn(*args, **kwargs): return _controls.ListItem_GetColumn(*args, **kwargs)
-    def GetState(*args, **kwargs): return _controls.ListItem_GetState(*args, **kwargs)
-    def GetText(*args, **kwargs): return _controls.ListItem_GetText(*args, **kwargs)
-    def GetImage(*args, **kwargs): return _controls.ListItem_GetImage(*args, **kwargs)
-    def GetData(*args, **kwargs): return _controls.ListItem_GetData(*args, **kwargs)
-    def GetWidth(*args, **kwargs): return _controls.ListItem_GetWidth(*args, **kwargs)
-    def GetAlign(*args, **kwargs): return _controls.ListItem_GetAlign(*args, **kwargs)
-    def GetAttributes(*args, **kwargs): return _controls.ListItem_GetAttributes(*args, **kwargs)
-    def HasAttributes(*args, **kwargs): return _controls.ListItem_HasAttributes(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.ListItem_GetTextColour(*args, **kwargs)
-    def GetBackgroundColour(*args, **kwargs): return _controls.ListItem_GetBackgroundColour(*args, **kwargs)
-    def GetFont(*args, **kwargs): return _controls.ListItem_GetFont(*args, **kwargs)
+
+    def Clear(*args, **kwargs):
+        """Clear()"""
+        return _controls.ListItem_Clear(*args, **kwargs)
+
+    def ClearAttributes(*args, **kwargs):
+        """ClearAttributes()"""
+        return _controls.ListItem_ClearAttributes(*args, **kwargs)
+
+    def SetMask(*args, **kwargs):
+        """SetMask(long mask)"""
+        return _controls.ListItem_SetMask(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(long id)"""
+        return _controls.ListItem_SetId(*args, **kwargs)
+
+    def SetColumn(*args, **kwargs):
+        """SetColumn(int col)"""
+        return _controls.ListItem_SetColumn(*args, **kwargs)
+
+    def SetState(*args, **kwargs):
+        """SetState(long state)"""
+        return _controls.ListItem_SetState(*args, **kwargs)
+
+    def SetStateMask(*args, **kwargs):
+        """SetStateMask(long stateMask)"""
+        return _controls.ListItem_SetStateMask(*args, **kwargs)
+
+    def SetText(*args, **kwargs):
+        """SetText(String text)"""
+        return _controls.ListItem_SetText(*args, **kwargs)
+
+    def SetImage(*args, **kwargs):
+        """SetImage(int image)"""
+        return _controls.ListItem_SetImage(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(long data)"""
+        return _controls.ListItem_SetData(*args, **kwargs)
+
+    def SetWidth(*args, **kwargs):
+        """SetWidth(int width)"""
+        return _controls.ListItem_SetWidth(*args, **kwargs)
+
+    def SetAlign(*args, **kwargs):
+        """SetAlign(int align)"""
+        return _controls.ListItem_SetAlign(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(Colour colText)"""
+        return _controls.ListItem_SetTextColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(Colour colBack)"""
+        return _controls.ListItem_SetBackgroundColour(*args, **kwargs)
+
+    def SetFont(*args, **kwargs):
+        """SetFont(Font font)"""
+        return _controls.ListItem_SetFont(*args, **kwargs)
+
+    def GetMask(*args, **kwargs):
+        """GetMask() -> long"""
+        return _controls.ListItem_GetMask(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> long"""
+        return _controls.ListItem_GetId(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn() -> int"""
+        return _controls.ListItem_GetColumn(*args, **kwargs)
+
+    def GetState(*args, **kwargs):
+        """GetState() -> long"""
+        return _controls.ListItem_GetState(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> String"""
+        return _controls.ListItem_GetText(*args, **kwargs)
+
+    def GetImage(*args, **kwargs):
+        """GetImage() -> int"""
+        return _controls.ListItem_GetImage(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> long"""
+        return _controls.ListItem_GetData(*args, **kwargs)
+
+    def GetWidth(*args, **kwargs):
+        """GetWidth() -> int"""
+        return _controls.ListItem_GetWidth(*args, **kwargs)
+
+    def GetAlign(*args, **kwargs):
+        """GetAlign() -> int"""
+        return _controls.ListItem_GetAlign(*args, **kwargs)
+
+    def GetAttributes(*args, **kwargs):
+        """GetAttributes() -> ListItemAttr"""
+        return _controls.ListItem_GetAttributes(*args, **kwargs)
+
+    def HasAttributes(*args, **kwargs):
+        """HasAttributes() -> bool"""
+        return _controls.ListItem_HasAttributes(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> Colour"""
+        return _controls.ListItem_GetTextColour(*args, **kwargs)
+
+    def GetBackgroundColour(*args, **kwargs):
+        """GetBackgroundColour() -> Colour"""
+        return _controls.ListItem_GetBackgroundColour(*args, **kwargs)
+
+    def GetFont(*args, **kwargs):
+        """GetFont() -> Font"""
+        return _controls.ListItem_GetFont(*args, **kwargs)
+

     m_mask = property(_controls.ListItem_m_mask_get, _controls.ListItem_m_mask_set)
     m_itemId = property(_controls.ListItem_m_itemId_get, _controls.ListItem_m_itemId_set)
     m_col = property(_controls.ListItem_m_col_get, _controls.ListItem_m_col_set)
     m_mask = property(_controls.ListItem_m_mask_get, _controls.ListItem_m_mask_set)
     m_itemId = property(_controls.ListItem_m_itemId_get, _controls.ListItem_m_itemId_set)
     m_col = property(_controls.ListItem_m_col_get, _controls.ListItem_m_col_set)


@@ -1477,8 +3275,6 @@ 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)

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 class ListItemPtr(ListItem):
     def __init__(self, this):
 
 class ListItemPtr(ListItem):
     def __init__(self, this):


@@ -1490,7 +3286,10 @@ _controls.ListItem_swigregister(ListItemPtr)
 #---------------------------------------------------------------------------
 
 class ListEvent(core.NotifyEvent):
 #---------------------------------------------------------------------------
 
 class ListEvent(core.NotifyEvent):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> ListEvent"""

         newobj = _controls.new_ListEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _controls.new_ListEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1501,24 +3300,64 @@ class ListEvent(core.NotifyEvent):
     m_col = property(_controls.ListEvent_m_col_get, _controls.ListEvent_m_col_set)
     m_pointDrag = property(_controls.ListEvent_m_pointDrag_get, _controls.ListEvent_m_pointDrag_set)
     m_item = property(_controls.ListEvent_m_item_get)
     m_col = property(_controls.ListEvent_m_col_get, _controls.ListEvent_m_col_set)
     m_pointDrag = property(_controls.ListEvent_m_pointDrag_get, _controls.ListEvent_m_pointDrag_set)
     m_item = property(_controls.ListEvent_m_item_get)

-    def GetKeyCode(*args, **kwargs): return _controls.ListEvent_GetKeyCode(*args, **kwargs)
+    def GetKeyCode(*args, **kwargs):
+        """GetKeyCode() -> int"""
+        return _controls.ListEvent_GetKeyCode(*args, **kwargs)
+

     GetCode = GetKeyCode 
     GetCode = GetKeyCode 

-    def GetIndex(*args, **kwargs): return _controls.ListEvent_GetIndex(*args, **kwargs)
-    def GetColumn(*args, **kwargs): return _controls.ListEvent_GetColumn(*args, **kwargs)
-    def GetPoint(*args, **kwargs): return _controls.ListEvent_GetPoint(*args, **kwargs)
-    GetPostiion = GetPoint 
-    def GetLabel(*args, **kwargs): return _controls.ListEvent_GetLabel(*args, **kwargs)
-    def GetText(*args, **kwargs): return _controls.ListEvent_GetText(*args, **kwargs)
-    def GetImage(*args, **kwargs): return _controls.ListEvent_GetImage(*args, **kwargs)
-    def GetData(*args, **kwargs): return _controls.ListEvent_GetData(*args, **kwargs)
-    def GetMask(*args, **kwargs): return _controls.ListEvent_GetMask(*args, **kwargs)
-    def GetItem(*args, **kwargs): return _controls.ListEvent_GetItem(*args, **kwargs)
-    def GetCacheFrom(*args, **kwargs): return _controls.ListEvent_GetCacheFrom(*args, **kwargs)
-    def GetCacheTo(*args, **kwargs): return _controls.ListEvent_GetCacheTo(*args, **kwargs)
-    def IsEditCancelled(*args, **kwargs): return _controls.ListEvent_IsEditCancelled(*args, **kwargs)
-    def SetEditCanceled(*args, **kwargs): return _controls.ListEvent_SetEditCanceled(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetIndex(*args, **kwargs):
+        """GetIndex() -> long"""
+        return _controls.ListEvent_GetIndex(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn() -> int"""
+        return _controls.ListEvent_GetColumn(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint() -> Point"""
+        return _controls.ListEvent_GetPoint(*args, **kwargs)
+
+    GetPosition = GetPoint 
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> String"""
+        return _controls.ListEvent_GetLabel(*args, **kwargs)
+
+    def GetText(*args, **kwargs):
+        """GetText() -> String"""
+        return _controls.ListEvent_GetText(*args, **kwargs)
+
+    def GetImage(*args, **kwargs):
+        """GetImage() -> int"""
+        return _controls.ListEvent_GetImage(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData() -> long"""
+        return _controls.ListEvent_GetData(*args, **kwargs)
+
+    def GetMask(*args, **kwargs):
+        """GetMask() -> long"""
+        return _controls.ListEvent_GetMask(*args, **kwargs)
+
+    def GetItem(*args, **kwargs):
+        """GetItem() -> ListItem"""
+        return _controls.ListEvent_GetItem(*args, **kwargs)
+
+    def GetCacheFrom(*args, **kwargs):
+        """GetCacheFrom() -> long"""
+        return _controls.ListEvent_GetCacheFrom(*args, **kwargs)
+
+    def GetCacheTo(*args, **kwargs):
+        """GetCacheTo() -> long"""
+        return _controls.ListEvent_GetCacheTo(*args, **kwargs)
+
+    def IsEditCancelled(*args, **kwargs):
+        """IsEditCancelled() -> bool"""
+        return _controls.ListEvent_IsEditCancelled(*args, **kwargs)
+
+    def SetEditCanceled(*args, **kwargs):
+        """SetEditCanceled(bool editCancelled)"""
+        return _controls.ListEvent_SetEditCanceled(*args, **kwargs)
+

 
 class ListEventPtr(ListEvent):
     def __init__(self, this):
 
 class ListEventPtr(ListEvent):
     def __init__(self, this):


@@ -1575,101 +3414,320 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
 #---------------------------------------------------------------------------
 
 class ListCtrl(core.Control):
 #---------------------------------------------------------------------------
 
 class ListCtrl(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=LC_ICON, 
+            Validator validator=DefaultValidator, String name=ListCtrlNameStr) -> ListCtrl
+        """

         newobj = _controls.new_ListCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)
         newobj = _controls.new_ListCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)

-    def Create(*args, **kwargs): return _controls.ListCtrl_Create(*args, **kwargs)
-    def _setCallbackInfo(*args, **kwargs): return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
-    def SetForegroundColour(*args, **kwargs): return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
-    def SetBackgroundColour(*args, **kwargs): return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
-    def GetColumn(*args, **kwargs): 
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=LC_ICON, 
+            Validator validator=DefaultValidator, String name=ListCtrlNameStr) -> bool
+
+        Do the 2nd phase and create the GUI control.
+        """
+        return _controls.ListCtrl_Create(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _controls.ListCtrl__setCallbackInfo(*args, **kwargs)
+
+    def SetForegroundColour(*args, **kwargs):
+        """SetForegroundColour(Colour col) -> bool"""
+        return _controls.ListCtrl_SetForegroundColour(*args, **kwargs)
+
+    def SetBackgroundColour(*args, **kwargs):
+        """SetBackgroundColour(Colour col) -> bool"""
+        return _controls.ListCtrl_SetBackgroundColour(*args, **kwargs)
+
+    def GetColumn(*args, **kwargs):
+        """GetColumn(int col) -> ListItem"""

         val = _controls.ListCtrl_GetColumn(*args, **kwargs)
         if val is not None: val.thisown = 1
         return val
         val = _controls.ListCtrl_GetColumn(*args, **kwargs)
         if val is not None: val.thisown = 1
         return val

-    def SetColumn(*args, **kwargs): return _controls.ListCtrl_SetColumn(*args, **kwargs)
-    def GetColumnWidth(*args, **kwargs): return _controls.ListCtrl_GetColumnWidth(*args, **kwargs)
-    def SetColumnWidth(*args, **kwargs): return _controls.ListCtrl_SetColumnWidth(*args, **kwargs)
-    def GetCountPerPage(*args, **kwargs): return _controls.ListCtrl_GetCountPerPage(*args, **kwargs)
-    def GetViewRect(*args, **kwargs): return _controls.ListCtrl_GetViewRect(*args, **kwargs)
-    def GetItem(*args, **kwargs): 
+
+    def SetColumn(*args, **kwargs):
+        """SetColumn(int col, ListItem item) -> bool"""
+        return _controls.ListCtrl_SetColumn(*args, **kwargs)
+
+    def GetColumnWidth(*args, **kwargs):
+        """GetColumnWidth(int col) -> int"""
+        return _controls.ListCtrl_GetColumnWidth(*args, **kwargs)
+
+    def SetColumnWidth(*args, **kwargs):
+        """SetColumnWidth(int col, int width) -> bool"""
+        return _controls.ListCtrl_SetColumnWidth(*args, **kwargs)
+
+    def GetCountPerPage(*args, **kwargs):
+        """GetCountPerPage() -> int"""
+        return _controls.ListCtrl_GetCountPerPage(*args, **kwargs)
+
+    def GetViewRect(*args, **kwargs):
+        """GetViewRect() -> Rect"""
+        return _controls.ListCtrl_GetViewRect(*args, **kwargs)
+
+    def GetItem(*args, **kwargs):
+        """GetItem(long itemId, int col=0) -> ListItem"""

         val = _controls.ListCtrl_GetItem(*args, **kwargs)
         if val is not None: val.thisown = 1
         return val
         val = _controls.ListCtrl_GetItem(*args, **kwargs)
         if val is not None: val.thisown = 1
         return val

-    def SetItem(*args, **kwargs): return _controls.ListCtrl_SetItem(*args, **kwargs)
-    def SetStringItem(*args, **kwargs): return _controls.ListCtrl_SetStringItem(*args, **kwargs)
-    def GetItemState(*args, **kwargs): return _controls.ListCtrl_GetItemState(*args, **kwargs)
-    def SetItemState(*args, **kwargs): return _controls.ListCtrl_SetItemState(*args, **kwargs)
-    def SetItemImage(*args, **kwargs): return _controls.ListCtrl_SetItemImage(*args, **kwargs)
-    def GetItemText(*args, **kwargs): return _controls.ListCtrl_GetItemText(*args, **kwargs)
-    def SetItemText(*args, **kwargs): return _controls.ListCtrl_SetItemText(*args, **kwargs)
-    def GetItemData(*args, **kwargs): return _controls.ListCtrl_GetItemData(*args, **kwargs)
-    def SetItemData(*args, **kwargs): return _controls.ListCtrl_SetItemData(*args, **kwargs)
-    def GetItemPosition(*args, **kwargs): return _controls.ListCtrl_GetItemPosition(*args, **kwargs)
-    def GetItemRect(*args, **kwargs): return _controls.ListCtrl_GetItemRect(*args, **kwargs)
-    def SetItemPosition(*args, **kwargs): return _controls.ListCtrl_SetItemPosition(*args, **kwargs)
-    def GetItemCount(*args, **kwargs): return _controls.ListCtrl_GetItemCount(*args, **kwargs)
-    def GetColumnCount(*args, **kwargs): return _controls.ListCtrl_GetColumnCount(*args, **kwargs)
-    def GetItemSpacing(*args, **kwargs): return _controls.ListCtrl_GetItemSpacing(*args, **kwargs)
-    def SetItemSpacing(*args, **kwargs): return _controls.ListCtrl_SetItemSpacing(*args, **kwargs)
-    def GetSelectedItemCount(*args, **kwargs): return _controls.ListCtrl_GetSelectedItemCount(*args, **kwargs)
-    def GetTextColour(*args, **kwargs): return _controls.ListCtrl_GetTextColour(*args, **kwargs)
-    def SetTextColour(*args, **kwargs): return _controls.ListCtrl_SetTextColour(*args, **kwargs)
-    def GetTopItem(*args, **kwargs): return _controls.ListCtrl_GetTopItem(*args, **kwargs)
-    def SetSingleStyle(*args, **kwargs): return _controls.ListCtrl_SetSingleStyle(*args, **kwargs)
-    def SetWindowStyleFlag(*args, **kwargs): return _controls.ListCtrl_SetWindowStyleFlag(*args, **kwargs)
-    def GetNextItem(*args, **kwargs): return _controls.ListCtrl_GetNextItem(*args, **kwargs)
-    def GetImageList(*args, **kwargs): return _controls.ListCtrl_GetImageList(*args, **kwargs)
-    def SetImageList(*args, **kwargs): return _controls.ListCtrl_SetImageList(*args, **kwargs)
-    def AssignImageList(*args, **kwargs): 
-        val = _controls.ListCtrl_AssignImageList(*args, **kwargs)
-        args[1].thisown = 0
-        return val
-    def IsVirtual(*args, **kwargs): return _controls.ListCtrl_IsVirtual(*args, **kwargs)
-    def RefreshItem(*args, **kwargs): return _controls.ListCtrl_RefreshItem(*args, **kwargs)
-    def RefreshItems(*args, **kwargs): return _controls.ListCtrl_RefreshItems(*args, **kwargs)
-    def Arrange(*args, **kwargs): return _controls.ListCtrl_Arrange(*args, **kwargs)
-    def DeleteItem(*args, **kwargs): return _controls.ListCtrl_DeleteItem(*args, **kwargs)
-    def DeleteAllItems(*args, **kwargs): return _controls.ListCtrl_DeleteAllItems(*args, **kwargs)
-    def DeleteColumn(*args, **kwargs): return _controls.ListCtrl_DeleteColumn(*args, **kwargs)
-    def DeleteAllColumns(*args, **kwargs): return _controls.ListCtrl_DeleteAllColumns(*args, **kwargs)
-    def ClearAll(*args, **kwargs): return _controls.ListCtrl_ClearAll(*args, **kwargs)
-    def EditLabel(*args, **kwargs): return _controls.ListCtrl_EditLabel(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _controls.ListCtrl_EnsureVisible(*args, **kwargs)
-    def FindItem(*args, **kwargs): return _controls.ListCtrl_FindItem(*args, **kwargs)
-    def FindItemData(*args, **kwargs): return _controls.ListCtrl_FindItemData(*args, **kwargs)
-    def FindItemAtPos(*args, **kwargs): return _controls.ListCtrl_FindItemAtPos(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.ListCtrl_HitTest(*args, **kwargs)
-    def InsertItem(*args, **kwargs): return _controls.ListCtrl_InsertItem(*args, **kwargs)
-    def InsertStringItem(*args, **kwargs): return _controls.ListCtrl_InsertStringItem(*args, **kwargs)
-    def InsertImageItem(*args, **kwargs): return _controls.ListCtrl_InsertImageItem(*args, **kwargs)
-    def InsertImageStringItem(*args, **kwargs): return _controls.ListCtrl_InsertImageStringItem(*args, **kwargs)
-    def InsertColumnInfo(*args, **kwargs): return _controls.ListCtrl_InsertColumnInfo(*args, **kwargs)
-    def InsertColumn(*args, **kwargs): return _controls.ListCtrl_InsertColumn(*args, **kwargs)
-    def SetItemCount(*args, **kwargs): return _controls.ListCtrl_SetItemCount(*args, **kwargs)
-    def ScrollList(*args, **kwargs): return _controls.ListCtrl_ScrollList(*args, **kwargs)
-    def SetItemTextColour(*args, **kwargs): return _controls.ListCtrl_SetItemTextColour(*args, **kwargs)
-    def GetItemTextColour(*args, **kwargs): return _controls.ListCtrl_GetItemTextColour(*args, **kwargs)
-    def SetItemBackgroundColour(*args, **kwargs): return _controls.ListCtrl_SetItemBackgroundColour(*args, **kwargs)
-    def GetItemBackgroundColour(*args, **kwargs): return _controls.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
+
+    def SetItem(*args, **kwargs):
+        """SetItem(ListItem info) -> bool"""
+        return _controls.ListCtrl_SetItem(*args, **kwargs)
+
+    def SetStringItem(*args, **kwargs):
+        """SetStringItem(long index, int col, String label, int imageId=-1) -> long"""
+        return _controls.ListCtrl_SetStringItem(*args, **kwargs)
+
+    def GetItemState(*args, **kwargs):
+        """GetItemState(long item, long stateMask) -> int"""
+        return _controls.ListCtrl_GetItemState(*args, **kwargs)
+
+    def SetItemState(*args, **kwargs):
+        """SetItemState(long item, long state, long stateMask) -> bool"""
+        return _controls.ListCtrl_SetItemState(*args, **kwargs)
+
+    def SetItemImage(*args, **kwargs):
+        """SetItemImage(long item, int image, int selImage) -> bool"""
+        return _controls.ListCtrl_SetItemImage(*args, **kwargs)
+
+    def GetItemText(*args, **kwargs):
+        """GetItemText(long item) -> String"""
+        return _controls.ListCtrl_GetItemText(*args, **kwargs)
+
+    def SetItemText(*args, **kwargs):
+        """SetItemText(long item, String str)"""
+        return _controls.ListCtrl_SetItemText(*args, **kwargs)
+
+    def GetItemData(*args, **kwargs):
+        """GetItemData(long item) -> long"""
+        return _controls.ListCtrl_GetItemData(*args, **kwargs)
+
+    def SetItemData(*args, **kwargs):
+        """SetItemData(long item, long data) -> bool"""
+        return _controls.ListCtrl_SetItemData(*args, **kwargs)
+
+    def GetItemPosition(*args, **kwargs):
+        """GetItemPosition(long item) -> Point"""
+        return _controls.ListCtrl_GetItemPosition(*args, **kwargs)
+
+    def GetItemRect(*args, **kwargs):
+        """GetItemRect(long item, int code=LIST_RECT_BOUNDS) -> Rect"""
+        return _controls.ListCtrl_GetItemRect(*args, **kwargs)
+
+    def SetItemPosition(*args, **kwargs):
+        """SetItemPosition(long item, Point pos) -> bool"""
+        return _controls.ListCtrl_SetItemPosition(*args, **kwargs)
+
+    def GetItemCount(*args, **kwargs):
+        """GetItemCount() -> int"""
+        return _controls.ListCtrl_GetItemCount(*args, **kwargs)
+
+    def GetColumnCount(*args, **kwargs):
+        """GetColumnCount() -> int"""
+        return _controls.ListCtrl_GetColumnCount(*args, **kwargs)
+
+    def GetItemSpacing(*args, **kwargs):
+        """GetItemSpacing() -> Size"""
+        return _controls.ListCtrl_GetItemSpacing(*args, **kwargs)
+
+    def SetItemSpacing(*args, **kwargs):
+        """SetItemSpacing(int spacing, bool isSmall=False)"""
+        return _controls.ListCtrl_SetItemSpacing(*args, **kwargs)
+
+    def GetSelectedItemCount(*args, **kwargs):
+        """GetSelectedItemCount() -> int"""
+        return _controls.ListCtrl_GetSelectedItemCount(*args, **kwargs)
+
+    def GetTextColour(*args, **kwargs):
+        """GetTextColour() -> Colour"""
+        return _controls.ListCtrl_GetTextColour(*args, **kwargs)
+
+    def SetTextColour(*args, **kwargs):
+        """SetTextColour(Colour col)"""
+        return _controls.ListCtrl_SetTextColour(*args, **kwargs)
+
+    def GetTopItem(*args, **kwargs):
+        """GetTopItem() -> long"""
+        return _controls.ListCtrl_GetTopItem(*args, **kwargs)
+
+    def SetSingleStyle(*args, **kwargs):
+        """SetSingleStyle(long style, bool add=True)"""
+        return _controls.ListCtrl_SetSingleStyle(*args, **kwargs)
+
+    def SetWindowStyleFlag(*args, **kwargs):
+        """
+        SetWindowStyleFlag(long style)
+
+        Sets the style of the window. Please note that some styles cannot be
+        changed after the window creation and that Refresh() might be called
+        after changing the others for the change to take place immediately.
+        """
+        return _controls.ListCtrl_SetWindowStyleFlag(*args, **kwargs)
+
+    def GetNextItem(*args, **kwargs):
+        """GetNextItem(long item, int geometry=LIST_NEXT_ALL, int state=LIST_STATE_DONTCARE) -> long"""
+        return _controls.ListCtrl_GetNextItem(*args, **kwargs)
+
+    def GetImageList(*args, **kwargs):
+        """GetImageList(int which) -> ImageList"""
+        return _controls.ListCtrl_GetImageList(*args, **kwargs)
+
+    def SetImageList(*args, **kwargs):
+        """SetImageList(ImageList imageList, int which)"""
+        return _controls.ListCtrl_SetImageList(*args, **kwargs)
+
+    def AssignImageList(*args, **kwargs):
+        """AssignImageList(ImageList imageList, int which)"""
+        return _controls.ListCtrl_AssignImageList(*args, **kwargs)
+
+    def InReportView(*args, **kwargs):
+        """InReportView() -> bool"""
+        return _controls.ListCtrl_InReportView(*args, **kwargs)
+
+    def IsVirtual(*args, **kwargs):
+        """IsVirtual() -> bool"""
+        return _controls.ListCtrl_IsVirtual(*args, **kwargs)
+
+    def RefreshItem(*args, **kwargs):
+        """RefreshItem(long item)"""
+        return _controls.ListCtrl_RefreshItem(*args, **kwargs)
+
+    def RefreshItems(*args, **kwargs):
+        """RefreshItems(long itemFrom, long itemTo)"""
+        return _controls.ListCtrl_RefreshItems(*args, **kwargs)
+
+    def Arrange(*args, **kwargs):
+        """Arrange(int flag=LIST_ALIGN_DEFAULT) -> bool"""
+        return _controls.ListCtrl_Arrange(*args, **kwargs)
+
+    def DeleteItem(*args, **kwargs):
+        """DeleteItem(long item) -> bool"""
+        return _controls.ListCtrl_DeleteItem(*args, **kwargs)
+
+    def DeleteAllItems(*args, **kwargs):
+        """DeleteAllItems() -> bool"""
+        return _controls.ListCtrl_DeleteAllItems(*args, **kwargs)
+
+    def DeleteColumn(*args, **kwargs):
+        """DeleteColumn(int col) -> bool"""
+        return _controls.ListCtrl_DeleteColumn(*args, **kwargs)
+
+    def DeleteAllColumns(*args, **kwargs):
+        """DeleteAllColumns() -> bool"""
+        return _controls.ListCtrl_DeleteAllColumns(*args, **kwargs)
+
+    def ClearAll(*args, **kwargs):
+        """ClearAll()"""
+        return _controls.ListCtrl_ClearAll(*args, **kwargs)
+
+    def EditLabel(*args, **kwargs):
+        """EditLabel(long item)"""
+        return _controls.ListCtrl_EditLabel(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(long item) -> bool"""
+        return _controls.ListCtrl_EnsureVisible(*args, **kwargs)
+
+    def FindItem(*args, **kwargs):
+        """FindItem(long start, String str, bool partial=False) -> long"""
+        return _controls.ListCtrl_FindItem(*args, **kwargs)
+
+    def FindItemData(*args, **kwargs):
+        """FindItemData(long start, long data) -> long"""
+        return _controls.ListCtrl_FindItemData(*args, **kwargs)
+
+    def FindItemAtPos(*args, **kwargs):
+        """FindItemAtPos(long start, Point pt, int direction) -> long"""
+        return _controls.ListCtrl_FindItemAtPos(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """
+        HitTest(Point point) -> (item, where)
+
+        Determines which item (if any) is at the specified point,
+        giving details in the second return value (see wxLIST_HITTEST_... flags.)
+        """
+        return _controls.ListCtrl_HitTest(*args, **kwargs)
+
+    def InsertItem(*args, **kwargs):
+        """InsertItem(ListItem info) -> long"""
+        return _controls.ListCtrl_InsertItem(*args, **kwargs)
+
+    def InsertStringItem(*args, **kwargs):
+        """InsertStringItem(long index, String label) -> long"""
+        return _controls.ListCtrl_InsertStringItem(*args, **kwargs)
+
+    def InsertImageItem(*args, **kwargs):
+        """InsertImageItem(long index, int imageIndex) -> long"""
+        return _controls.ListCtrl_InsertImageItem(*args, **kwargs)
+
+    def InsertImageStringItem(*args, **kwargs):
+        """InsertImageStringItem(long index, String label, int imageIndex) -> long"""
+        return _controls.ListCtrl_InsertImageStringItem(*args, **kwargs)
+
+    def InsertColumnInfo(*args, **kwargs):
+        """InsertColumnInfo(long col, ListItem info) -> long"""
+        return _controls.ListCtrl_InsertColumnInfo(*args, **kwargs)
+
+    def InsertColumn(*args, **kwargs):
+        """
+        InsertColumn(long col, String heading, int format=LIST_FORMAT_LEFT, 
+            int width=-1) -> long
+        """
+        return _controls.ListCtrl_InsertColumn(*args, **kwargs)
+
+    def SetItemCount(*args, **kwargs):
+        """SetItemCount(long count)"""
+        return _controls.ListCtrl_SetItemCount(*args, **kwargs)
+
+    def ScrollList(*args, **kwargs):
+        """ScrollList(int dx, int dy) -> bool"""
+        return _controls.ListCtrl_ScrollList(*args, **kwargs)
+
+    def SetItemTextColour(*args, **kwargs):
+        """SetItemTextColour(long item, Colour col)"""
+        return _controls.ListCtrl_SetItemTextColour(*args, **kwargs)
+
+    def GetItemTextColour(*args, **kwargs):
+        """GetItemTextColour(long item) -> Colour"""
+        return _controls.ListCtrl_GetItemTextColour(*args, **kwargs)
+
+    def SetItemBackgroundColour(*args, **kwargs):
+        """SetItemBackgroundColour(long item, Colour col)"""
+        return _controls.ListCtrl_SetItemBackgroundColour(*args, **kwargs)
+
+    def GetItemBackgroundColour(*args, **kwargs):
+        """GetItemBackgroundColour(long item) -> Colour"""
+        return _controls.ListCtrl_GetItemBackgroundColour(*args, **kwargs)
+

     #
     # Some helpers...
     def Select(self, idx, on=1):
         '''[de]select an item'''
     #
     # Some helpers...
     def Select(self, idx, on=1):
         '''[de]select an item'''

-        if on: state = wxLIST_STATE_SELECTED
+        if on: state = wx.LIST_STATE_SELECTED

         else: state = 0
         else: state = 0

-        self.SetItemState(idx, state, wxLIST_STATE_SELECTED)
+        self.SetItemState(idx, state, wx.LIST_STATE_SELECTED)

 
     def Focus(self, idx):
         '''Focus and show the given item'''
 
     def Focus(self, idx):
         '''Focus and show the given item'''

-        self.SetItemState(idx, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED)
+        self.SetItemState(idx, wx.LIST_STATE_FOCUSED, wx.LIST_STATE_FOCUSED)

         self.EnsureVisible(idx)
 
     def GetFocusedItem(self):
         '''get the currently focused item or -1 if none'''
         self.EnsureVisible(idx)
 
     def GetFocusedItem(self):
         '''get the currently focused item or -1 if none'''

-        return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED)
+        return self.GetNextItem(-1, wx.LIST_NEXT_ALL, wx.LIST_STATE_FOCUSED)

 
     def GetFirstSelected(self, *args):
         '''return first selected item, or -1 when none'''
 
     def GetFirstSelected(self, *args):
         '''return first selected item, or -1 when none'''


@@ -1677,22 +3735,22 @@ class ListCtrl(core.Control):
 
     def GetNextSelected(self, item):
         '''return subsequent selected items, or -1 when no more'''
 
     def GetNextSelected(self, item):
         '''return subsequent selected items, or -1 when no more'''

-        return self.GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)
+        return self.GetNextItem(item, wx.LIST_NEXT_ALL, wx.LIST_STATE_SELECTED)

 
     def IsSelected(self, idx):
 
     def IsSelected(self, idx):

-        '''return TRUE if the item is selected'''
-        return self.GetItemState(idx, wxLIST_STATE_SELECTED) != 0
+        '''return True if the item is selected'''
+        return self.GetItemState(idx, wx.LIST_STATE_SELECTED) != 0

 
     def SetColumnImage(self, col, image):
         item = self.GetColumn(col)
 
     def SetColumnImage(self, col, image):
         item = self.GetColumn(col)

-        
-        item.SetMask( wxLIST_MASK_STATE |
-                      wxLIST_MASK_TEXT  |
-                      wxLIST_MASK_IMAGE |
-                      wxLIST_MASK_DATA  |
-                      wxLIST_SET_ITEM   |
-                      wxLIST_MASK_WIDTH |
-                      wxLIST_MASK_FORMAT )
+        # preserve all other attributes too
+        item.SetMask( wx.LIST_MASK_STATE |
+                      wx.LIST_MASK_TEXT  |
+                      wx.LIST_MASK_IMAGE |
+                      wx.LIST_MASK_DATA  |
+                      wx.LIST_SET_ITEM   |
+                      wx.LIST_MASK_WIDTH |
+                      wx.LIST_MASK_FORMAT )

         item.SetImage(image)
         self.SetColumn(col, item)
 
         item.SetImage(image)
         self.SetColumn(col, item)
 


@@ -1703,7 +3761,7 @@ class ListCtrl(core.Control):
         '''Append an item to the list control.  The entry parameter should be a
            sequence with an item for each column'''
         if len(entry):
         '''Append an item to the list control.  The entry parameter should be a
            sequence with an item for each column'''
         if len(entry):

-            if wx.wxUSE_UNICODE:
+            if wx.USE_UNICODE:

                 cvtfunc = unicode
             else:
                 cvtfunc = str
                 cvtfunc = unicode
             else:
                 cvtfunc = str


@@ -1713,10 +3771,14 @@ class ListCtrl(core.Control):
                 self.SetStringItem(pos, i, cvtfunc(entry[i]))
             return pos
 
                 self.SetStringItem(pos, i, cvtfunc(entry[i]))
             return pos
 

-    def SortItems(*args, **kwargs): return _controls.ListCtrl_SortItems(*args, **kwargs)
-    def GetMainWindow(*args, **kwargs): return _controls.ListCtrl_GetMainWindow(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SortItems(*args, **kwargs):
+        """SortItems(PyObject func) -> bool"""
+        return _controls.ListCtrl_SortItems(*args, **kwargs)
+
+    def GetMainWindow(*args, **kwargs):
+        """GetMainWindow() -> Window"""
+        return _controls.ListCtrl_GetMainWindow(*args, **kwargs)
+

 
 class ListCtrlPtr(ListCtrl):
     def __init__(self, this):
 
 class ListCtrlPtr(ListCtrl):
     def __init__(self, this):


@@ -1726,6 +3788,7 @@ class ListCtrlPtr(ListCtrl):
 _controls.ListCtrl_swigregister(ListCtrlPtr)
 
 def PreListCtrl(*args, **kwargs):
 _controls.ListCtrl_swigregister(ListCtrlPtr)
 
 def PreListCtrl(*args, **kwargs):

+    """PreListCtrl() -> ListCtrl"""

     val = _controls.new_PreListCtrl(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreListCtrl(*args, **kwargs)
     val.thisown = 1
     return val


@@ -1733,23 +3796,62 @@ def PreListCtrl(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class ListView(ListCtrl):
 #---------------------------------------------------------------------------
 
 class ListView(ListCtrl):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxListView instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=LC_REPORT, 
+            Validator validator=DefaultValidator, String name=ListCtrlNameStr) -> ListView
+        """

         newobj = _controls.new_ListView(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_ListView(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.ListView_Create(*args, **kwargs)
-    def Select(*args, **kwargs): return _controls.ListView_Select(*args, **kwargs)
-    def Focus(*args, **kwargs): return _controls.ListView_Focus(*args, **kwargs)
-    def GetFocusedItem(*args, **kwargs): return _controls.ListView_GetFocusedItem(*args, **kwargs)
-    def GetNextSelected(*args, **kwargs): return _controls.ListView_GetNextSelected(*args, **kwargs)
-    def GetFirstSelected(*args, **kwargs): return _controls.ListView_GetFirstSelected(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _controls.ListView_IsSelected(*args, **kwargs)
-    def SetColumnImage(*args, **kwargs): return _controls.ListView_SetColumnImage(*args, **kwargs)
-    def ClearColumnImage(*args, **kwargs): return _controls.ListView_ClearColumnImage(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxListView instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=LC_REPORT, 
+            Validator validator=DefaultValidator, String name=ListCtrlNameStr) -> bool
+
+        Do the 2nd phase and create the GUI control.
+        """
+        return _controls.ListView_Create(*args, **kwargs)
+
+    def Select(*args, **kwargs):
+        """Select(long n, bool on=True)"""
+        return _controls.ListView_Select(*args, **kwargs)
+
+    def Focus(*args, **kwargs):
+        """Focus(long index)"""
+        return _controls.ListView_Focus(*args, **kwargs)
+
+    def GetFocusedItem(*args, **kwargs):
+        """GetFocusedItem() -> long"""
+        return _controls.ListView_GetFocusedItem(*args, **kwargs)
+
+    def GetNextSelected(*args, **kwargs):
+        """GetNextSelected(long item) -> long"""
+        return _controls.ListView_GetNextSelected(*args, **kwargs)
+
+    def GetFirstSelected(*args, **kwargs):
+        """GetFirstSelected() -> long"""
+        return _controls.ListView_GetFirstSelected(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(long index) -> bool"""
+        return _controls.ListView_IsSelected(*args, **kwargs)
+
+    def SetColumnImage(*args, **kwargs):
+        """SetColumnImage(int col, int image)"""
+        return _controls.ListView_SetColumnImage(*args, **kwargs)
+
+    def ClearColumnImage(*args, **kwargs):
+        """ClearColumnImage(int col)"""
+        return _controls.ListView_ClearColumnImage(*args, **kwargs)
+

 
 class ListViewPtr(ListView):
     def __init__(self, this):
 
 class ListViewPtr(ListView):
     def __init__(self, this):


@@ -1759,6 +3861,7 @@ class ListViewPtr(ListView):
 _controls.ListView_swigregister(ListViewPtr)
 
 def PreListView(*args, **kwargs):
 _controls.ListView_swigregister(ListViewPtr)
 
 def PreListView(*args, **kwargs):

+    """PreListView() -> ListView"""

     val = _controls.new_PreListView(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreListView(*args, **kwargs)
     val.thisown = 1
     return val


@@ -1803,23 +3906,35 @@ TREE_HITTEST_ONITEM = _controls.TREE_HITTEST_ONITEM
 #---------------------------------------------------------------------------
 
 class TreeItemId(object):
 #---------------------------------------------------------------------------
 
 class TreeItemId(object):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTreeItemId instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__() -> TreeItemId"""

         newobj = _controls.new_TreeItemId(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_TreeItemId):
         newobj = _controls.new_TreeItemId(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_TreeItemId):

+        """__del__()"""

         try:
             if self.thisown: destroy(self)
         except: pass
         try:
             if self.thisown: destroy(self)
         except: pass

-    def IsOk(*args, **kwargs): return _controls.TreeItemId_IsOk(*args, **kwargs)
-    def __eq__(*args, **kwargs): return _controls.TreeItemId___eq__(*args, **kwargs)
-    def __ne__(*args, **kwargs): return _controls.TreeItemId___ne__(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk() -> bool"""
+        return _controls.TreeItemId_IsOk(*args, **kwargs)
+
+    def __eq__(*args, **kwargs):
+        """__eq__(TreeItemId other) -> bool"""
+        return _controls.TreeItemId___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(TreeItemId other) -> bool"""
+        return _controls.TreeItemId___ne__(*args, **kwargs)
+

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

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTreeItemId instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 class TreeItemIdPtr(TreeItemId):
     def __init__(self, this):
 
 class TreeItemIdPtr(TreeItemId):
     def __init__(self, this):


@@ -1827,20 +3942,37 @@ class TreeItemIdPtr(TreeItemId):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = TreeItemId
 _controls.TreeItemId_swigregister(TreeItemIdPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = TreeItemId
 _controls.TreeItemId_swigregister(TreeItemIdPtr)

+TreeCtrlNameStr = cvar.TreeCtrlNameStr

 
 class TreeItemData(object):
 
 class TreeItemData(object):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTreeItemData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__(PyObject obj=None) -> TreeItemData"""

         newobj = _controls.new_TreeItemData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_TreeItemData(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def GetData(*args, **kwargs): return _controls.TreeItemData_GetData(*args, **kwargs)
-    def SetData(*args, **kwargs): return _controls.TreeItemData_SetData(*args, **kwargs)
-    def GetId(*args, **kwargs): return _controls.TreeItemData_GetId(*args, **kwargs)
-    def SetId(*args, **kwargs): return _controls.TreeItemData_SetId(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _controls.TreeItemData_Destroy(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTreeItemData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetData(*args, **kwargs):
+        """GetData() -> PyObject"""
+        return _controls.TreeItemData_GetData(*args, **kwargs)
+
+    def SetData(*args, **kwargs):
+        """SetData(PyObject obj)"""
+        return _controls.TreeItemData_SetData(*args, **kwargs)
+
+    def GetId(*args, **kwargs):
+        """GetId() -> TreeItemId"""
+        return _controls.TreeItemData_GetId(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(TreeItemId id)"""
+        return _controls.TreeItemData_SetId(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _controls.TreeItemData_Destroy(*args, **kwargs)
+

 
 class TreeItemDataPtr(TreeItemData):
     def __init__(self, this):
 
 class TreeItemDataPtr(TreeItemData):
     def __init__(self, this):


@@ -1870,6 +4002,7 @@ wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = _controls.wxEVT_COMMAND_TREE_ITEM_RIGHT_CL
 wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = _controls.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
 wxEVT_COMMAND_TREE_END_DRAG = _controls.wxEVT_COMMAND_TREE_END_DRAG
 wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = _controls.wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK
 wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = _controls.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
 wxEVT_COMMAND_TREE_END_DRAG = _controls.wxEVT_COMMAND_TREE_END_DRAG
 wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = _controls.wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK

+wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP = _controls.wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP

 EVT_TREE_BEGIN_DRAG        = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_DRAG       , 1)
 EVT_TREE_BEGIN_RDRAG       = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_RDRAG      , 1)
 EVT_TREE_BEGIN_LABEL_EDIT  = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT , 1)
 EVT_TREE_BEGIN_DRAG        = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_DRAG       , 1)
 EVT_TREE_BEGIN_RDRAG       = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_RDRAG      , 1)
 EVT_TREE_BEGIN_LABEL_EDIT  = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT , 1)


@@ -1889,29 +4022,73 @@ EVT_TREE_ITEM_RIGHT_CLICK  = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLIC
 EVT_TREE_ITEM_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 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_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 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)

 
 class TreeEvent(core.NotifyEvent):
 
 class TreeEvent(core.NotifyEvent):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxTreeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> TreeEvent"""

         newobj = _controls.new_TreeEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_TreeEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def GetItem(*args, **kwargs): return _controls.TreeEvent_GetItem(*args, **kwargs)
-    def SetItem(*args, **kwargs): return _controls.TreeEvent_SetItem(*args, **kwargs)
-    def GetOldItem(*args, **kwargs): return _controls.TreeEvent_GetOldItem(*args, **kwargs)
-    def SetOldItem(*args, **kwargs): return _controls.TreeEvent_SetOldItem(*args, **kwargs)
-    def GetPoint(*args, **kwargs): return _controls.TreeEvent_GetPoint(*args, **kwargs)
-    def SetPoint(*args, **kwargs): return _controls.TreeEvent_SetPoint(*args, **kwargs)
-    def GetKeyEvent(*args, **kwargs): return _controls.TreeEvent_GetKeyEvent(*args, **kwargs)
-    def GetKeyCode(*args, **kwargs): return _controls.TreeEvent_GetKeyCode(*args, **kwargs)
-    def SetKeyEvent(*args, **kwargs): return _controls.TreeEvent_SetKeyEvent(*args, **kwargs)
-    def GetLabel(*args, **kwargs): return _controls.TreeEvent_GetLabel(*args, **kwargs)
-    def SetLabel(*args, **kwargs): return _controls.TreeEvent_SetLabel(*args, **kwargs)
-    def IsEditCancelled(*args, **kwargs): return _controls.TreeEvent_IsEditCancelled(*args, **kwargs)
-    def SetEditCanceled(*args, **kwargs): return _controls.TreeEvent_SetEditCanceled(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTreeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetItem(*args, **kwargs):
+        """GetItem() -> TreeItemId"""
+        return _controls.TreeEvent_GetItem(*args, **kwargs)
+
+    def SetItem(*args, **kwargs):
+        """SetItem(TreeItemId item)"""
+        return _controls.TreeEvent_SetItem(*args, **kwargs)
+
+    def GetOldItem(*args, **kwargs):
+        """GetOldItem() -> TreeItemId"""
+        return _controls.TreeEvent_GetOldItem(*args, **kwargs)
+
+    def SetOldItem(*args, **kwargs):
+        """SetOldItem(TreeItemId item)"""
+        return _controls.TreeEvent_SetOldItem(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint() -> Point"""
+        return _controls.TreeEvent_GetPoint(*args, **kwargs)
+
+    def SetPoint(*args, **kwargs):
+        """SetPoint(Point pt)"""
+        return _controls.TreeEvent_SetPoint(*args, **kwargs)
+
+    def GetKeyEvent(*args, **kwargs):
+        """GetKeyEvent() -> KeyEvent"""
+        return _controls.TreeEvent_GetKeyEvent(*args, **kwargs)
+
+    def GetKeyCode(*args, **kwargs):
+        """GetKeyCode() -> int"""
+        return _controls.TreeEvent_GetKeyCode(*args, **kwargs)
+
+    def SetKeyEvent(*args, **kwargs):
+        """SetKeyEvent(KeyEvent evt)"""
+        return _controls.TreeEvent_SetKeyEvent(*args, **kwargs)
+
+    def GetLabel(*args, **kwargs):
+        """GetLabel() -> String"""
+        return _controls.TreeEvent_GetLabel(*args, **kwargs)
+
+    def SetLabel(*args, **kwargs):
+        """SetLabel(String label)"""
+        return _controls.TreeEvent_SetLabel(*args, **kwargs)
+
+    def IsEditCancelled(*args, **kwargs):
+        """IsEditCancelled() -> bool"""
+        return _controls.TreeEvent_IsEditCancelled(*args, **kwargs)
+
+    def SetEditCanceled(*args, **kwargs):
+        """SetEditCanceled(bool editCancelled)"""
+        return _controls.TreeEvent_SetEditCanceled(*args, **kwargs)
+
+    def SetToolTip(*args, **kwargs):
+        """SetToolTip(String toolTip)"""
+        return _controls.TreeEvent_SetToolTip(*args, **kwargs)
+

 
 class TreeEventPtr(TreeEvent):
     def __init__(self, this):
 
 class TreeEventPtr(TreeEvent):
     def __init__(self, this):


@@ -1923,91 +4100,334 @@ _controls.TreeEvent_swigregister(TreeEventPtr)
 #---------------------------------------------------------------------------
 
 class TreeCtrl(core.Control):
 #---------------------------------------------------------------------------
 
 class TreeCtrl(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=TreeCtrlNameStr) -> TreeCtrl
+        """

         newobj = _controls.new_TreeCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)
         newobj = _controls.new_TreeCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)

-    def Create(*args, **kwargs): return _controls.TreeCtrl_Create(*args, **kwargs)
-    def _setCallbackInfo(*args, **kwargs): return _controls.TreeCtrl__setCallbackInfo(*args, **kwargs)
-    def GetCount(*args, **kwargs): return _controls.TreeCtrl_GetCount(*args, **kwargs)
-    def GetIndent(*args, **kwargs): return _controls.TreeCtrl_GetIndent(*args, **kwargs)
-    def SetIndent(*args, **kwargs): return _controls.TreeCtrl_SetIndent(*args, **kwargs)
-    def GetSpacing(*args, **kwargs): return _controls.TreeCtrl_GetSpacing(*args, **kwargs)
-    def SetSpacing(*args, **kwargs): return _controls.TreeCtrl_SetSpacing(*args, **kwargs)
-    def GetImageList(*args, **kwargs): return _controls.TreeCtrl_GetImageList(*args, **kwargs)
-    def GetStateImageList(*args, **kwargs): return _controls.TreeCtrl_GetStateImageList(*args, **kwargs)
-    def SetImageList(*args, **kwargs): return _controls.TreeCtrl_SetImageList(*args, **kwargs)
-    def SetStateImageList(*args, **kwargs): return _controls.TreeCtrl_SetStateImageList(*args, **kwargs)
-    def AssignImageList(*args, **kwargs): 
-        val = _controls.TreeCtrl_AssignImageList(*args, **kwargs)
-        args[1].thisown = 0
-        return val
-    def AssignStateImageList(*args, **kwargs): 
-        val = _controls.TreeCtrl_AssignStateImageList(*args, **kwargs)
-        args[1].thisown = 0
-        return val
-    def GetItemText(*args, **kwargs): return _controls.TreeCtrl_GetItemText(*args, **kwargs)
-    def GetItemImage(*args, **kwargs): return _controls.TreeCtrl_GetItemImage(*args, **kwargs)
-    def GetItemData(*args, **kwargs): return _controls.TreeCtrl_GetItemData(*args, **kwargs)
-    def GetItemPyData(*args, **kwargs): return _controls.TreeCtrl_GetItemPyData(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=TR_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=TreeCtrlNameStr) -> bool
+
+        Do the 2nd phase and create the GUI control.
+        """
+        return _controls.TreeCtrl_Create(*args, **kwargs)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _controls.TreeCtrl__setCallbackInfo(*args, **kwargs)
+
+    def GetCount(*args, **kwargs):
+        """GetCount() -> size_t"""
+        return _controls.TreeCtrl_GetCount(*args, **kwargs)
+
+    def GetIndent(*args, **kwargs):
+        """GetIndent() -> unsigned int"""
+        return _controls.TreeCtrl_GetIndent(*args, **kwargs)
+
+    def SetIndent(*args, **kwargs):
+        """SetIndent(unsigned int indent)"""
+        return _controls.TreeCtrl_SetIndent(*args, **kwargs)
+
+    def GetSpacing(*args, **kwargs):
+        """GetSpacing() -> unsigned int"""
+        return _controls.TreeCtrl_GetSpacing(*args, **kwargs)
+
+    def SetSpacing(*args, **kwargs):
+        """SetSpacing(unsigned int spacing)"""
+        return _controls.TreeCtrl_SetSpacing(*args, **kwargs)
+
+    def GetImageList(*args, **kwargs):
+        """GetImageList() -> ImageList"""
+        return _controls.TreeCtrl_GetImageList(*args, **kwargs)
+
+    def GetStateImageList(*args, **kwargs):
+        """GetStateImageList() -> ImageList"""
+        return _controls.TreeCtrl_GetStateImageList(*args, **kwargs)
+
+    def SetImageList(*args, **kwargs):
+        """SetImageList(ImageList imageList)"""
+        return _controls.TreeCtrl_SetImageList(*args, **kwargs)
+
+    def SetStateImageList(*args, **kwargs):
+        """SetStateImageList(ImageList imageList)"""
+        return _controls.TreeCtrl_SetStateImageList(*args, **kwargs)
+
+    def AssignImageList(*args, **kwargs):
+        """AssignImageList(ImageList imageList)"""
+        return _controls.TreeCtrl_AssignImageList(*args, **kwargs)
+
+    def AssignStateImageList(*args, **kwargs):
+        """AssignStateImageList(ImageList imageList)"""
+        return _controls.TreeCtrl_AssignStateImageList(*args, **kwargs)
+
+    def GetItemText(*args, **kwargs):
+        """GetItemText(TreeItemId item) -> String"""
+        return _controls.TreeCtrl_GetItemText(*args, **kwargs)
+
+    def GetItemImage(*args, **kwargs):
+        """GetItemImage(TreeItemId item, int which=TreeItemIcon_Normal) -> int"""
+        return _controls.TreeCtrl_GetItemImage(*args, **kwargs)
+
+    def GetItemData(*args, **kwargs):
+        """GetItemData(TreeItemId item) -> TreeItemData"""
+        return _controls.TreeCtrl_GetItemData(*args, **kwargs)
+
+    def GetItemPyData(*args, **kwargs):
+        """GetItemPyData(TreeItemId item) -> PyObject"""
+        return _controls.TreeCtrl_GetItemPyData(*args, **kwargs)
+

     GetPyData = GetItemPyData 
     GetPyData = GetItemPyData 

-    def GetItemTextColour(*args, **kwargs): return _controls.TreeCtrl_GetItemTextColour(*args, **kwargs)
-    def GetItemBackgroundColour(*args, **kwargs): return _controls.TreeCtrl_GetItemBackgroundColour(*args, **kwargs)
-    def GetItemFont(*args, **kwargs): return _controls.TreeCtrl_GetItemFont(*args, **kwargs)
-    def SetItemText(*args, **kwargs): return _controls.TreeCtrl_SetItemText(*args, **kwargs)
-    def SetItemImage(*args, **kwargs): return _controls.TreeCtrl_SetItemImage(*args, **kwargs)
-    def SetItemData(*args, **kwargs): return _controls.TreeCtrl_SetItemData(*args, **kwargs)
-    def SetItemPyData(*args, **kwargs): return _controls.TreeCtrl_SetItemPyData(*args, **kwargs)
+    def GetItemTextColour(*args, **kwargs):
+        """GetItemTextColour(TreeItemId item) -> Colour"""
+        return _controls.TreeCtrl_GetItemTextColour(*args, **kwargs)
+
+    def GetItemBackgroundColour(*args, **kwargs):
+        """GetItemBackgroundColour(TreeItemId item) -> Colour"""
+        return _controls.TreeCtrl_GetItemBackgroundColour(*args, **kwargs)
+
+    def GetItemFont(*args, **kwargs):
+        """GetItemFont(TreeItemId item) -> Font"""
+        return _controls.TreeCtrl_GetItemFont(*args, **kwargs)
+
+    def SetItemText(*args, **kwargs):
+        """SetItemText(TreeItemId item, String text)"""
+        return _controls.TreeCtrl_SetItemText(*args, **kwargs)
+
+    def SetItemImage(*args, **kwargs):
+        """SetItemImage(TreeItemId item, int image, int which=TreeItemIcon_Normal)"""
+        return _controls.TreeCtrl_SetItemImage(*args, **kwargs)
+
+    def SetItemData(*args, **kwargs):
+        """SetItemData(TreeItemId item, TreeItemData data)"""
+        return _controls.TreeCtrl_SetItemData(*args, **kwargs)
+
+    def SetItemPyData(*args, **kwargs):
+        """SetItemPyData(TreeItemId item, PyObject obj)"""
+        return _controls.TreeCtrl_SetItemPyData(*args, **kwargs)
+

     SetPyData = SetItemPyData 
     SetPyData = SetItemPyData 

-    def SetItemHasChildren(*args, **kwargs): return _controls.TreeCtrl_SetItemHasChildren(*args, **kwargs)
-    def SetItemBold(*args, **kwargs): return _controls.TreeCtrl_SetItemBold(*args, **kwargs)
-    def SetItemTextColour(*args, **kwargs): return _controls.TreeCtrl_SetItemTextColour(*args, **kwargs)
-    def SetItemBackgroundColour(*args, **kwargs): return _controls.TreeCtrl_SetItemBackgroundColour(*args, **kwargs)
-    def SetItemFont(*args, **kwargs): return _controls.TreeCtrl_SetItemFont(*args, **kwargs)
-    def IsVisible(*args, **kwargs): return _controls.TreeCtrl_IsVisible(*args, **kwargs)
-    def ItemHasChildren(*args, **kwargs): return _controls.TreeCtrl_ItemHasChildren(*args, **kwargs)
-    def IsExpanded(*args, **kwargs): return _controls.TreeCtrl_IsExpanded(*args, **kwargs)
-    def IsSelected(*args, **kwargs): return _controls.TreeCtrl_IsSelected(*args, **kwargs)
-    def IsBold(*args, **kwargs): return _controls.TreeCtrl_IsBold(*args, **kwargs)
-    def GetChildrenCount(*args, **kwargs): return _controls.TreeCtrl_GetChildrenCount(*args, **kwargs)
-    def GetRootItem(*args, **kwargs): return _controls.TreeCtrl_GetRootItem(*args, **kwargs)
-    def GetSelection(*args, **kwargs): return _controls.TreeCtrl_GetSelection(*args, **kwargs)
-    def GetSelections(*args, **kwargs): return _controls.TreeCtrl_GetSelections(*args, **kwargs)
-    def GetItemParent(*args, **kwargs): return _controls.TreeCtrl_GetItemParent(*args, **kwargs)
-    def GetFirstChild(*args, **kwargs): return _controls.TreeCtrl_GetFirstChild(*args, **kwargs)
-    def GetNextChild(*args, **kwargs): return _controls.TreeCtrl_GetNextChild(*args, **kwargs)
-    def GetLastChild(*args, **kwargs): return _controls.TreeCtrl_GetLastChild(*args, **kwargs)
-    def GetNextSibling(*args, **kwargs): return _controls.TreeCtrl_GetNextSibling(*args, **kwargs)
-    def GetPrevSibling(*args, **kwargs): return _controls.TreeCtrl_GetPrevSibling(*args, **kwargs)
-    def GetFirstVisibleItem(*args, **kwargs): return _controls.TreeCtrl_GetFirstVisibleItem(*args, **kwargs)
-    def GetNextVisible(*args, **kwargs): return _controls.TreeCtrl_GetNextVisible(*args, **kwargs)
-    def GetPrevVisible(*args, **kwargs): return _controls.TreeCtrl_GetPrevVisible(*args, **kwargs)
-    def AddRoot(*args, **kwargs): return _controls.TreeCtrl_AddRoot(*args, **kwargs)
-    def PrependItem(*args, **kwargs): return _controls.TreeCtrl_PrependItem(*args, **kwargs)
-    def InsertItem(*args, **kwargs): return _controls.TreeCtrl_InsertItem(*args, **kwargs)
-    def InsertItemBefore(*args, **kwargs): return _controls.TreeCtrl_InsertItemBefore(*args, **kwargs)
-    def AppendItem(*args, **kwargs): return _controls.TreeCtrl_AppendItem(*args, **kwargs)
-    def Delete(*args, **kwargs): return _controls.TreeCtrl_Delete(*args, **kwargs)
-    def DeleteChildren(*args, **kwargs): return _controls.TreeCtrl_DeleteChildren(*args, **kwargs)
-    def DeleteAllItems(*args, **kwargs): return _controls.TreeCtrl_DeleteAllItems(*args, **kwargs)
-    def Expand(*args, **kwargs): return _controls.TreeCtrl_Expand(*args, **kwargs)
-    def Collapse(*args, **kwargs): return _controls.TreeCtrl_Collapse(*args, **kwargs)
-    def CollapseAndReset(*args, **kwargs): return _controls.TreeCtrl_CollapseAndReset(*args, **kwargs)
-    def Toggle(*args, **kwargs): return _controls.TreeCtrl_Toggle(*args, **kwargs)
-    def Unselect(*args, **kwargs): return _controls.TreeCtrl_Unselect(*args, **kwargs)
-    def UnselectAll(*args, **kwargs): return _controls.TreeCtrl_UnselectAll(*args, **kwargs)
-    def SelectItem(*args, **kwargs): return _controls.TreeCtrl_SelectItem(*args, **kwargs)
-    def EnsureVisible(*args, **kwargs): return _controls.TreeCtrl_EnsureVisible(*args, **kwargs)
-    def ScrollTo(*args, **kwargs): return _controls.TreeCtrl_ScrollTo(*args, **kwargs)
-    def EditLabel(*args, **kwargs): return _controls.TreeCtrl_EditLabel(*args, **kwargs)
-    def GetEditControl(*args, **kwargs): return _controls.TreeCtrl_GetEditControl(*args, **kwargs)
-    def SortChildren(*args, **kwargs): return _controls.TreeCtrl_SortChildren(*args, **kwargs)
-    def HitTest(*args, **kwargs): return _controls.TreeCtrl_HitTest(*args, **kwargs)
-    def GetBoundingRect(*args, **kwargs): return _controls.TreeCtrl_GetBoundingRect(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTreeCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def SetItemHasChildren(*args, **kwargs):
+        """SetItemHasChildren(TreeItemId item, bool has=True)"""
+        return _controls.TreeCtrl_SetItemHasChildren(*args, **kwargs)
+
+    def SetItemBold(*args, **kwargs):
+        """SetItemBold(TreeItemId item, bool bold=True)"""
+        return _controls.TreeCtrl_SetItemBold(*args, **kwargs)
+
+    def SetItemTextColour(*args, **kwargs):
+        """SetItemTextColour(TreeItemId item, Colour col)"""
+        return _controls.TreeCtrl_SetItemTextColour(*args, **kwargs)
+
+    def SetItemBackgroundColour(*args, **kwargs):
+        """SetItemBackgroundColour(TreeItemId item, Colour col)"""
+        return _controls.TreeCtrl_SetItemBackgroundColour(*args, **kwargs)
+
+    def SetItemFont(*args, **kwargs):
+        """SetItemFont(TreeItemId item, Font font)"""
+        return _controls.TreeCtrl_SetItemFont(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsVisible(*args, **kwargs)
+
+    def ItemHasChildren(*args, **kwargs):
+        """ItemHasChildren(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_ItemHasChildren(*args, **kwargs)
+
+    def IsExpanded(*args, **kwargs):
+        """IsExpanded(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsExpanded(*args, **kwargs)
+
+    def IsSelected(*args, **kwargs):
+        """IsSelected(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsSelected(*args, **kwargs)
+
+    def IsBold(*args, **kwargs):
+        """IsBold(TreeItemId item) -> bool"""
+        return _controls.TreeCtrl_IsBold(*args, **kwargs)
+
+    def GetChildrenCount(*args, **kwargs):
+        """GetChildrenCount(TreeItemId item, bool recursively=True) -> size_t"""
+        return _controls.TreeCtrl_GetChildrenCount(*args, **kwargs)
+
+    def GetRootItem(*args, **kwargs):
+        """GetRootItem() -> TreeItemId"""
+        return _controls.TreeCtrl_GetRootItem(*args, **kwargs)
+
+    def GetSelection(*args, **kwargs):
+        """GetSelection() -> TreeItemId"""
+        return _controls.TreeCtrl_GetSelection(*args, **kwargs)
+
+    def GetSelections(*args, **kwargs):
+        """GetSelections() -> PyObject"""
+        return _controls.TreeCtrl_GetSelections(*args, **kwargs)
+
+    def GetItemParent(*args, **kwargs):
+        """GetItemParent(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetItemParent(*args, **kwargs)
+
+    def GetFirstChild(*args, **kwargs):
+        """GetFirstChild(TreeItemId item) -> PyObject"""
+        return _controls.TreeCtrl_GetFirstChild(*args, **kwargs)
+
+    def GetNextChild(*args, **kwargs):
+        """GetNextChild(TreeItemId item, void cookie) -> PyObject"""
+        return _controls.TreeCtrl_GetNextChild(*args, **kwargs)
+
+    def GetLastChild(*args, **kwargs):
+        """GetLastChild(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetLastChild(*args, **kwargs)
+
+    def GetNextSibling(*args, **kwargs):
+        """GetNextSibling(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetNextSibling(*args, **kwargs)
+
+    def GetPrevSibling(*args, **kwargs):
+        """GetPrevSibling(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetPrevSibling(*args, **kwargs)
+
+    def GetFirstVisibleItem(*args, **kwargs):
+        """GetFirstVisibleItem() -> TreeItemId"""
+        return _controls.TreeCtrl_GetFirstVisibleItem(*args, **kwargs)
+
+    def GetNextVisible(*args, **kwargs):
+        """GetNextVisible(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetNextVisible(*args, **kwargs)
+
+    def GetPrevVisible(*args, **kwargs):
+        """GetPrevVisible(TreeItemId item) -> TreeItemId"""
+        return _controls.TreeCtrl_GetPrevVisible(*args, **kwargs)
+
+    def AddRoot(*args, **kwargs):
+        """AddRoot(String text, int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId"""
+        return _controls.TreeCtrl_AddRoot(*args, **kwargs)
+
+    def PrependItem(*args, **kwargs):
+        """
+        PrependItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 
+            TreeItemData data=None) -> TreeItemId
+        """
+        return _controls.TreeCtrl_PrependItem(*args, **kwargs)
+
+    def InsertItem(*args, **kwargs):
+        """
+        InsertItem(TreeItemId parent, TreeItemId idPrevious, String text, 
+            int image=-1, int selectedImage=-1, TreeItemData data=None) -> TreeItemId
+        """
+        return _controls.TreeCtrl_InsertItem(*args, **kwargs)
+
+    def InsertItemBefore(*args, **kwargs):
+        """
+        InsertItemBefore(TreeItemId parent, size_t index, String text, int image=-1, 
+            int selectedImage=-1, TreeItemData data=None) -> TreeItemId
+        """
+        return _controls.TreeCtrl_InsertItemBefore(*args, **kwargs)
+
+    def AppendItem(*args, **kwargs):
+        """
+        AppendItem(TreeItemId parent, String text, int image=-1, int selectedImage=-1, 
+            TreeItemData data=None) -> TreeItemId
+        """
+        return _controls.TreeCtrl_AppendItem(*args, **kwargs)
+
+    def Delete(*args, **kwargs):
+        """Delete(TreeItemId item)"""
+        return _controls.TreeCtrl_Delete(*args, **kwargs)
+
+    def DeleteChildren(*args, **kwargs):
+        """DeleteChildren(TreeItemId item)"""
+        return _controls.TreeCtrl_DeleteChildren(*args, **kwargs)
+
+    def DeleteAllItems(*args, **kwargs):
+        """DeleteAllItems()"""
+        return _controls.TreeCtrl_DeleteAllItems(*args, **kwargs)
+
+    def Expand(*args, **kwargs):
+        """Expand(TreeItemId item)"""
+        return _controls.TreeCtrl_Expand(*args, **kwargs)
+
+    def Collapse(*args, **kwargs):
+        """Collapse(TreeItemId item)"""
+        return _controls.TreeCtrl_Collapse(*args, **kwargs)
+
+    def CollapseAndReset(*args, **kwargs):
+        """CollapseAndReset(TreeItemId item)"""
+        return _controls.TreeCtrl_CollapseAndReset(*args, **kwargs)
+
+    def Toggle(*args, **kwargs):
+        """Toggle(TreeItemId item)"""
+        return _controls.TreeCtrl_Toggle(*args, **kwargs)
+
+    def Unselect(*args, **kwargs):
+        """Unselect()"""
+        return _controls.TreeCtrl_Unselect(*args, **kwargs)
+
+    def UnselectItem(*args, **kwargs):
+        """UnselectItem(TreeItemId item)"""
+        return _controls.TreeCtrl_UnselectItem(*args, **kwargs)
+
+    def UnselectAll(*args, **kwargs):
+        """UnselectAll()"""
+        return _controls.TreeCtrl_UnselectAll(*args, **kwargs)
+
+    def SelectItem(*args, **kwargs):
+        """SelectItem(TreeItemId item, bool select=True)"""
+        return _controls.TreeCtrl_SelectItem(*args, **kwargs)
+
+    def ToggleItemSelection(*args, **kwargs):
+        """ToggleItemSelection(TreeItemId item)"""
+        return _controls.TreeCtrl_ToggleItemSelection(*args, **kwargs)
+
+    def EnsureVisible(*args, **kwargs):
+        """EnsureVisible(TreeItemId item)"""
+        return _controls.TreeCtrl_EnsureVisible(*args, **kwargs)
+
+    def ScrollTo(*args, **kwargs):
+        """ScrollTo(TreeItemId item)"""
+        return _controls.TreeCtrl_ScrollTo(*args, **kwargs)
+
+    def EditLabel(*args, **kwargs):
+        """EditLabel(TreeItemId item)"""
+        return _controls.TreeCtrl_EditLabel(*args, **kwargs)
+
+    def GetEditControl(*args, **kwargs):
+        """GetEditControl() -> TextCtrl"""
+        return _controls.TreeCtrl_GetEditControl(*args, **kwargs)
+
+    def SortChildren(*args, **kwargs):
+        """SortChildren(TreeItemId item)"""
+        return _controls.TreeCtrl_SortChildren(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """
+        HitTest(Point point) -> (item, where)
+
+        Determine which item (if any) belongs the given point.  The
+        coordinates specified are relative to the client area of tree ctrl
+        and the where return value is set to a bitmask of wxTREE_HITTEST_xxx
+        constants.
+
+        """
+        return _controls.TreeCtrl_HitTest(*args, **kwargs)
+
+    def GetBoundingRect(*args, **kwargs):
+        """GetBoundingRect(TreeItemId item, bool textOnly=False) -> PyObject"""
+        return _controls.TreeCtrl_GetBoundingRect(*args, **kwargs)
+

 
 class TreeCtrlPtr(TreeCtrl):
     def __init__(self, this):
 
 class TreeCtrlPtr(TreeCtrl):
     def __init__(self, this):


@@ -2017,6 +4437,7 @@ class TreeCtrlPtr(TreeCtrl):
 _controls.TreeCtrl_swigregister(TreeCtrlPtr)
 
 def PreTreeCtrl(*args, **kwargs):
 _controls.TreeCtrl_swigregister(TreeCtrlPtr)
 
 def PreTreeCtrl(*args, **kwargs):

+    """PreTreeCtrl() -> TreeCtrl"""

     val = _controls.new_PreTreeCtrl(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreTreeCtrl(*args, **kwargs)
     val.thisown = 1
     return val


@@ -2029,33 +4450,111 @@ DIRCTRL_SHOW_FILTERS = _controls.DIRCTRL_SHOW_FILTERS
 DIRCTRL_3D_INTERNAL = _controls.DIRCTRL_3D_INTERNAL
 DIRCTRL_EDIT_LABELS = _controls.DIRCTRL_EDIT_LABELS
 class GenericDirCtrl(core.Control):
 DIRCTRL_3D_INTERNAL = _controls.DIRCTRL_3D_INTERNAL
 DIRCTRL_EDIT_LABELS = _controls.DIRCTRL_EDIT_LABELS
 class GenericDirCtrl(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGenericDirCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=-1, String dir=DirDialogDefaultFolderStr, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
+            String filter=EmptyString, 
+            int defaultFilter=0, String name=TreeCtrlNameStr) -> GenericDirCtrl
+        """

         newobj = _controls.new_GenericDirCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_GenericDirCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.GenericDirCtrl_Create(*args, **kwargs)
-    def ExpandPath(*args, **kwargs): return _controls.GenericDirCtrl_ExpandPath(*args, **kwargs)
-    def GetDefaultPath(*args, **kwargs): return _controls.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
-    def SetDefaultPath(*args, **kwargs): return _controls.GenericDirCtrl_SetDefaultPath(*args, **kwargs)
-    def GetPath(*args, **kwargs): return _controls.GenericDirCtrl_GetPath(*args, **kwargs)
-    def GetFilePath(*args, **kwargs): return _controls.GenericDirCtrl_GetFilePath(*args, **kwargs)
-    def SetPath(*args, **kwargs): return _controls.GenericDirCtrl_SetPath(*args, **kwargs)
-    def ShowHidden(*args, **kwargs): return _controls.GenericDirCtrl_ShowHidden(*args, **kwargs)
-    def GetShowHidden(*args, **kwargs): return _controls.GenericDirCtrl_GetShowHidden(*args, **kwargs)
-    def GetFilter(*args, **kwargs): return _controls.GenericDirCtrl_GetFilter(*args, **kwargs)
-    def SetFilter(*args, **kwargs): return _controls.GenericDirCtrl_SetFilter(*args, **kwargs)
-    def GetFilterIndex(*args, **kwargs): return _controls.GenericDirCtrl_GetFilterIndex(*args, **kwargs)
-    def SetFilterIndex(*args, **kwargs): return _controls.GenericDirCtrl_SetFilterIndex(*args, **kwargs)
-    def GetRootId(*args, **kwargs): return _controls.GenericDirCtrl_GetRootId(*args, **kwargs)
-    def GetTreeCtrl(*args, **kwargs): return _controls.GenericDirCtrl_GetTreeCtrl(*args, **kwargs)
-    def GetFilterListCtrl(*args, **kwargs): return _controls.GenericDirCtrl_GetFilterListCtrl(*args, **kwargs)
-    def FindChild(*args, **kwargs): return _controls.GenericDirCtrl_FindChild(*args, **kwargs)
-    def DoResize(*args, **kwargs): return _controls.GenericDirCtrl_DoResize(*args, **kwargs)
-    def ReCreateTree(*args, **kwargs): return _controls.GenericDirCtrl_ReCreateTree(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxGenericDirCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(Window parent, int id=-1, String dir=DirDialogDefaultFolderStr, 
+            Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, 
+            String filter=EmptyString, 
+            int defaultFilter=0, String name=TreeCtrlNameStr) -> bool
+        """
+        return _controls.GenericDirCtrl_Create(*args, **kwargs)
+
+    def ExpandPath(*args, **kwargs):
+        """ExpandPath(String path) -> bool"""
+        return _controls.GenericDirCtrl_ExpandPath(*args, **kwargs)
+
+    def GetDefaultPath(*args, **kwargs):
+        """GetDefaultPath() -> String"""
+        return _controls.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
+
+    def SetDefaultPath(*args, **kwargs):
+        """SetDefaultPath(String path)"""
+        return _controls.GenericDirCtrl_SetDefaultPath(*args, **kwargs)
+
+    def GetPath(*args, **kwargs):
+        """GetPath() -> String"""
+        return _controls.GenericDirCtrl_GetPath(*args, **kwargs)
+
+    def GetFilePath(*args, **kwargs):
+        """GetFilePath() -> String"""
+        return _controls.GenericDirCtrl_GetFilePath(*args, **kwargs)
+
+    def SetPath(*args, **kwargs):
+        """SetPath(String path)"""
+        return _controls.GenericDirCtrl_SetPath(*args, **kwargs)
+
+    def ShowHidden(*args, **kwargs):
+        """ShowHidden(bool show)"""
+        return _controls.GenericDirCtrl_ShowHidden(*args, **kwargs)
+
+    def GetShowHidden(*args, **kwargs):
+        """GetShowHidden() -> bool"""
+        return _controls.GenericDirCtrl_GetShowHidden(*args, **kwargs)
+
+    def GetFilter(*args, **kwargs):
+        """GetFilter() -> String"""
+        return _controls.GenericDirCtrl_GetFilter(*args, **kwargs)
+
+    def SetFilter(*args, **kwargs):
+        """SetFilter(String filter)"""
+        return _controls.GenericDirCtrl_SetFilter(*args, **kwargs)
+
+    def GetFilterIndex(*args, **kwargs):
+        """GetFilterIndex() -> int"""
+        return _controls.GenericDirCtrl_GetFilterIndex(*args, **kwargs)
+
+    def SetFilterIndex(*args, **kwargs):
+        """SetFilterIndex(int n)"""
+        return _controls.GenericDirCtrl_SetFilterIndex(*args, **kwargs)
+
+    def GetRootId(*args, **kwargs):
+        """GetRootId() -> TreeItemId"""
+        return _controls.GenericDirCtrl_GetRootId(*args, **kwargs)
+
+    def GetTreeCtrl(*args, **kwargs):
+        """GetTreeCtrl() -> TreeCtrl"""
+        return _controls.GenericDirCtrl_GetTreeCtrl(*args, **kwargs)
+
+    def GetFilterListCtrl(*args, **kwargs):
+        """GetFilterListCtrl() -> DirFilterListCtrl"""
+        return _controls.GenericDirCtrl_GetFilterListCtrl(*args, **kwargs)
+
+    def FindChild(*args, **kwargs):
+        """
+        FindChild(wxTreeItemId parentId, wxString path) -> (item, done)
+
+        Find the child that matches the first part of 'path'.  E.g. if a child path is
+        "/usr" and 'path' is "/usr/include" then the child for /usr is returned.
+        If the path string has been used (we're at the leaf), done is set to True
+
+        """
+        return _controls.GenericDirCtrl_FindChild(*args, **kwargs)
+
+    def DoResize(*args, **kwargs):
+        """DoResize()"""
+        return _controls.GenericDirCtrl_DoResize(*args, **kwargs)
+
+    def ReCreateTree(*args, **kwargs):
+        """ReCreateTree()"""
+        return _controls.GenericDirCtrl_ReCreateTree(*args, **kwargs)
+

 
 class GenericDirCtrlPtr(GenericDirCtrl):
     def __init__(self, this):
 
 class GenericDirCtrlPtr(GenericDirCtrl):
     def __init__(self, this):


@@ -2063,23 +4562,39 @@ class GenericDirCtrlPtr(GenericDirCtrl):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = GenericDirCtrl
 _controls.GenericDirCtrl_swigregister(GenericDirCtrlPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = GenericDirCtrl
 _controls.GenericDirCtrl_swigregister(GenericDirCtrlPtr)

+DirDialogDefaultFolderStr = cvar.DirDialogDefaultFolderStr

 
 def PreGenericDirCtrl(*args, **kwargs):
 
 def PreGenericDirCtrl(*args, **kwargs):

+    """PreGenericDirCtrl() -> GenericDirCtrl"""

     val = _controls.new_PreGenericDirCtrl(*args, **kwargs)
     val.thisown = 1
     return val
 
 class DirFilterListCtrl(Choice):
     val = _controls.new_PreGenericDirCtrl(*args, **kwargs)
     val.thisown = 1
     return val
 
 class DirFilterListCtrl(Choice):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxDirFilterListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(GenericDirCtrl parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0) -> DirFilterListCtrl
+        """

         newobj = _controls.new_DirFilterListCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_DirFilterListCtrl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def Create(*args, **kwargs): return _controls.DirFilterListCtrl_Create(*args, **kwargs)
-    def FillFilterList(*args, **kwargs): return _controls.DirFilterListCtrl_FillFilterList(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDirFilterListCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def Create(*args, **kwargs):
+        """
+        Create(GenericDirCtrl parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0) -> bool
+        """
+        return _controls.DirFilterListCtrl_Create(*args, **kwargs)
+
+    def FillFilterList(*args, **kwargs):
+        """FillFilterList(String filter, int defaultFilter)"""
+        return _controls.DirFilterListCtrl_FillFilterList(*args, **kwargs)
+

 
 class DirFilterListCtrlPtr(DirFilterListCtrl):
     def __init__(self, this):
 
 class DirFilterListCtrlPtr(DirFilterListCtrl):
     def __init__(self, this):


@@ -2089,6 +4604,7 @@ class DirFilterListCtrlPtr(DirFilterListCtrl):
 _controls.DirFilterListCtrl_swigregister(DirFilterListCtrlPtr)
 
 def PreDirFilterListCtrl(*args, **kwargs):
 _controls.DirFilterListCtrl_swigregister(DirFilterListCtrlPtr)
 
 def PreDirFilterListCtrl(*args, **kwargs):

+    """PreDirFilterListCtrl() -> DirFilterListCtrl"""

     val = _controls.new_PreDirFilterListCtrl(*args, **kwargs)
     val.thisown = 1
     return val
     val = _controls.new_PreDirFilterListCtrl(*args, **kwargs)
     val.thisown = 1
     return val


@@ -2096,33 +4612,96 @@ def PreDirFilterListCtrl(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class PyControl(core.Control):
 #---------------------------------------------------------------------------
 
 class PyControl(core.Control):

+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxPyControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=0, Validator validator=DefaultValidator, 
+            String name=ControlNameStr) -> PyControl
+        """

         newobj = _controls.new_PyControl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self); self._setCallbackInfo(self, PyControl)
         newobj = _controls.new_PyControl(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self); self._setCallbackInfo(self, PyControl)

-    def _setCallbackInfo(*args, **kwargs): return _controls.PyControl__setCallbackInfo(*args, **kwargs)
-    def base_DoMoveWindow(*args, **kwargs): return _controls.PyControl_base_DoMoveWindow(*args, **kwargs)
-    def base_DoSetSize(*args, **kwargs): return _controls.PyControl_base_DoSetSize(*args, **kwargs)
-    def base_DoSetClientSize(*args, **kwargs): return _controls.PyControl_base_DoSetClientSize(*args, **kwargs)
-    def base_DoSetVirtualSize(*args, **kwargs): return _controls.PyControl_base_DoSetVirtualSize(*args, **kwargs)
-    def base_DoGetSize(*args, **kwargs): return _controls.PyControl_base_DoGetSize(*args, **kwargs)
-    def base_DoGetClientSize(*args, **kwargs): return _controls.PyControl_base_DoGetClientSize(*args, **kwargs)
-    def base_DoGetPosition(*args, **kwargs): return _controls.PyControl_base_DoGetPosition(*args, **kwargs)
-    def base_DoGetVirtualSize(*args, **kwargs): return _controls.PyControl_base_DoGetVirtualSize(*args, **kwargs)
-    def base_DoGetBestSize(*args, **kwargs): return _controls.PyControl_base_DoGetBestSize(*args, **kwargs)
-    def base_InitDialog(*args, **kwargs): return _controls.PyControl_base_InitDialog(*args, **kwargs)
-    def base_TransferDataToWindow(*args, **kwargs): return _controls.PyControl_base_TransferDataToWindow(*args, **kwargs)
-    def base_TransferDataFromWindow(*args, **kwargs): return _controls.PyControl_base_TransferDataFromWindow(*args, **kwargs)
-    def base_Validate(*args, **kwargs): return _controls.PyControl_base_Validate(*args, **kwargs)
-    def base_AcceptsFocus(*args, **kwargs): return _controls.PyControl_base_AcceptsFocus(*args, **kwargs)
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs): return _controls.PyControl_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-    def base_GetMaxSize(*args, **kwargs): return _controls.PyControl_base_GetMaxSize(*args, **kwargs)
-    def base_AddChild(*args, **kwargs): return _controls.PyControl_base_AddChild(*args, **kwargs)
-    def base_RemoveChild(*args, **kwargs): return _controls.PyControl_base_RemoveChild(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(PyObject self, PyObject _class)"""
+        return _controls.PyControl__setCallbackInfo(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kwargs):
+        """base_DoMoveWindow(int x, int y, int width, int height)"""
+        return _controls.PyControl_base_DoMoveWindow(*args, **kwargs)
+
+    def base_DoSetSize(*args, **kwargs):
+        """base_DoSetSize(int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _controls.PyControl_base_DoSetSize(*args, **kwargs)
+
+    def base_DoSetClientSize(*args, **kwargs):
+        """base_DoSetClientSize(int width, int height)"""
+        return _controls.PyControl_base_DoSetClientSize(*args, **kwargs)
+
+    def base_DoSetVirtualSize(*args, **kwargs):
+        """base_DoSetVirtualSize(int x, int y)"""
+        return _controls.PyControl_base_DoSetVirtualSize(*args, **kwargs)
+
+    def base_DoGetSize(*args, **kwargs):
+        """base_DoGetSize() -> (width, height)"""
+        return _controls.PyControl_base_DoGetSize(*args, **kwargs)
+
+    def base_DoGetClientSize(*args, **kwargs):
+        """base_DoGetClientSize() -> (width, height)"""
+        return _controls.PyControl_base_DoGetClientSize(*args, **kwargs)
+
+    def base_DoGetPosition(*args, **kwargs):
+        """base_DoGetPosition() -> (x,y)"""
+        return _controls.PyControl_base_DoGetPosition(*args, **kwargs)
+
+    def base_DoGetVirtualSize(*args, **kwargs):
+        """base_DoGetVirtualSize() -> Size"""
+        return _controls.PyControl_base_DoGetVirtualSize(*args, **kwargs)
+
+    def base_DoGetBestSize(*args, **kwargs):
+        """base_DoGetBestSize() -> Size"""
+        return _controls.PyControl_base_DoGetBestSize(*args, **kwargs)
+
+    def base_InitDialog(*args, **kwargs):
+        """base_InitDialog()"""
+        return _controls.PyControl_base_InitDialog(*args, **kwargs)
+
+    def base_TransferDataToWindow(*args, **kwargs):
+        """base_TransferDataToWindow() -> bool"""
+        return _controls.PyControl_base_TransferDataToWindow(*args, **kwargs)
+
+    def base_TransferDataFromWindow(*args, **kwargs):
+        """base_TransferDataFromWindow() -> bool"""
+        return _controls.PyControl_base_TransferDataFromWindow(*args, **kwargs)
+
+    def base_Validate(*args, **kwargs):
+        """base_Validate() -> bool"""
+        return _controls.PyControl_base_Validate(*args, **kwargs)
+
+    def base_AcceptsFocus(*args, **kwargs):
+        """base_AcceptsFocus() -> bool"""
+        return _controls.PyControl_base_AcceptsFocus(*args, **kwargs)
+
+    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
+        """base_AcceptsFocusFromKeyboard() -> bool"""
+        return _controls.PyControl_base_AcceptsFocusFromKeyboard(*args, **kwargs)
+
+    def base_GetMaxSize(*args, **kwargs):
+        """base_GetMaxSize() -> Size"""
+        return _controls.PyControl_base_GetMaxSize(*args, **kwargs)
+
+    def base_AddChild(*args, **kwargs):
+        """base_AddChild(Window child)"""
+        return _controls.PyControl_base_AddChild(*args, **kwargs)
+
+    def base_RemoveChild(*args, **kwargs):
+        """base_RemoveChild(Window child)"""
+        return _controls.PyControl_base_RemoveChild(*args, **kwargs)
+

 
 class PyControlPtr(PyControl):
     def __init__(self, this):
 
 class PyControlPtr(PyControl):
     def __init__(self, this):


@@ -2143,19 +4722,89 @@ EVT_DETAILED_HELP = wx.PyEventBinder( wxEVT_DETAILED_HELP, 1)
 EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 
 class HelpEvent(core.CommandEvent):
 EVT_DETAILED_HELP_RANGE = wx.PyEventBinder( wxEVT_DETAILED_HELP, 2)
 
 class HelpEvent(core.CommandEvent):

+    """
+    A help event is sent when the user has requested
+    context-sensitive help. This can either be caused by the
+    application requesting context-sensitive help mode via
+    wx.ContextHelp, or (on MS Windows) by the system generating a
+    WM_HELP message when the user pressed F1 or clicked on the query
+    button in a dialog caption.
+
+    A help event is sent to the window that the user clicked on, and
+    is propagated up the window hierarchy until the event is
+    processed or there are no more event handlers. The application
+    should call event.GetId to check the identity of the clicked-on
+    window, and then either show some suitable help or call
+    event.Skip if the identifier is unrecognised. Calling Skip is
+    important because it allows wxWindows to generate further events
+    for ancestors of the clicked-on window. Otherwise it would be
+    impossible to show help for container windows, since processing
+    would stop after the first window found.
+
+     Events
+        EVT_HELP            Sent when the user has requested context-
+                            sensitive help.
+        EVT_HELP_RANGE      Allows to catch EVT_HELP for a range of IDs
+
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHelpEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """__init__(wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""

         newobj = _controls.new_HelpEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_HelpEvent(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def GetPosition(*args, **kwargs): return _controls.HelpEvent_GetPosition(*args, **kwargs)
-    def SetPosition(*args, **kwargs): return _controls.HelpEvent_SetPosition(*args, **kwargs)
-    def GetLink(*args, **kwargs): return _controls.HelpEvent_GetLink(*args, **kwargs)
-    def SetLink(*args, **kwargs): return _controls.HelpEvent_SetLink(*args, **kwargs)
-    def GetTarget(*args, **kwargs): return _controls.HelpEvent_GetTarget(*args, **kwargs)
-    def SetTarget(*args, **kwargs): return _controls.HelpEvent_SetTarget(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHelpEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def GetPosition(*args, **kwargs):
+        """
+        GetPosition() -> Point
+
+        Returns the left-click position of the mouse, in screen
+        coordinates. This allows the application to position the help
+        appropriately.
+        """
+        return _controls.HelpEvent_GetPosition(*args, **kwargs)
+
+    def SetPosition(*args, **kwargs):
+        """
+        SetPosition(Point pos)
+
+        Sets the left-click position of the mouse, in screen coordinates.
+        """
+        return _controls.HelpEvent_SetPosition(*args, **kwargs)
+
+    def GetLink(*args, **kwargs):
+        """
+        GetLink() -> String
+
+        Get an optional link to further help
+        """
+        return _controls.HelpEvent_GetLink(*args, **kwargs)
+
+    def SetLink(*args, **kwargs):
+        """
+        SetLink(String link)
+
+        Set an optional link to further help
+        """
+        return _controls.HelpEvent_SetLink(*args, **kwargs)
+
+    def GetTarget(*args, **kwargs):
+        """
+        GetTarget() -> String
+
+        Get an optional target to display help in. E.g. a window specification
+        """
+        return _controls.HelpEvent_GetTarget(*args, **kwargs)
+
+    def SetTarget(*args, **kwargs):
+        """
+        SetTarget(String target)
+
+        Set an optional target to display help in. E.g. a window specification
+        """
+        return _controls.HelpEvent_SetTarget(*args, **kwargs)
+

 
 class HelpEventPtr(HelpEvent):
     def __init__(self, this):
 
 class HelpEventPtr(HelpEvent):
     def __init__(self, this):


@@ -2165,19 +4814,72 @@ class HelpEventPtr(HelpEvent):
 _controls.HelpEvent_swigregister(HelpEventPtr)
 
 class ContextHelp(core.Object):
 _controls.HelpEvent_swigregister(HelpEventPtr)
 
 class ContextHelp(core.Object):

+    """
+    This class changes the cursor to a query and puts the application
+    into a 'context-sensitive help mode'. When the user left-clicks
+    on a window within the specified window, a EVT_HELP event is sent
+    to that control, and the application may respond to it by popping
+    up some help.
+
+    There are a couple of ways to invoke this behaviour implicitly:
+
+        * Use the wx.DIALOG_EX_CONTEXTHELP extended style for a
+          dialog (Windows only). This will put a question mark in the
+          titlebar, and Windows will put the application into
+          context-sensitive help mode automatically, with further
+          programming.
+
+        * Create a wx.ContextHelpButton, whose predefined behaviour
+          is to create a context help object. Normally you will write
+          your application so that this button is only added to a
+          dialog for non-Windows platforms (use
+          wx.DIALOG_EX_CONTEXTHELP on Windows).
+
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxContextHelp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window window=None, bool doNow=True) -> ContextHelp
+
+        Constructs a context help object, calling BeginContextHelp if
+        doNow is true (the default).
+
+        If window is None, the top window is used.
+        """

         newobj = _controls.new_ContextHelp(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_ContextHelp):
         newobj = _controls.new_ContextHelp(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def __del__(self, destroy=_controls.delete_ContextHelp):

+        """__del__()"""

         try:
             if self.thisown: destroy(self)
         except: pass
         try:
             if self.thisown: destroy(self)
         except: pass

-    def BeginContextHelp(*args, **kwargs): return _controls.ContextHelp_BeginContextHelp(*args, **kwargs)
-    def EndContextHelp(*args, **kwargs): return _controls.ContextHelp_EndContextHelp(*args, **kwargs)
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxContextHelp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+
+    def BeginContextHelp(*args, **kwargs):
+        """
+        BeginContextHelp(Window window=None) -> bool
+
+        Puts the application into context-sensitive help mode. window is
+        the window which will be used to catch events; if NULL, the top
+        window will be used.
+
+        Returns true if the application was successfully put into
+        context-sensitive help mode. This function only returns when the
+        event loop has finished.
+        """
+        return _controls.ContextHelp_BeginContextHelp(*args, **kwargs)
+
+    def EndContextHelp(*args, **kwargs):
+        """
+        EndContextHelp() -> bool
+
+        Ends context-sensitive help mode. Not normally called by the
+        application.
+        """
+        return _controls.ContextHelp_EndContextHelp(*args, **kwargs)
+

 
 class ContextHelpPtr(ContextHelp):
     def __init__(self, this):
 
 class ContextHelpPtr(ContextHelp):
     def __init__(self, this):


@@ -2187,14 +4889,34 @@ class ContextHelpPtr(ContextHelp):
 _controls.ContextHelp_swigregister(ContextHelpPtr)
 
 class ContextHelpButton(BitmapButton):
 _controls.ContextHelp_swigregister(ContextHelpPtr)
 
 class ContextHelpButton(BitmapButton):

+    """
+    Instances of this class may be used to add a question mark button
+    that when pressed, puts the application into context-help
+    mode. It does this by creating a wx.ContextHelp object which
+    itself generates a EVT_HELP event when the user clicks on a
+    window.
+
+    On Windows, you may add a question-mark icon to a dialog by use
+    of the wx.DIALOG_EX_CONTEXTHELP extra style, but on other
+    platforms you will have to add a button explicitly, usually next
+    to OK, Cancel or similar buttons.
+
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxContextHelpButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__(Window parent, int id=ID_CONTEXT_HELP, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=BU_AUTODRAW) -> ContextHelpButton
+
+        Constructor, creating and showing a context help button.
+        """

         newobj = _controls.new_ContextHelpButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
         newobj = _controls.new_ContextHelpButton(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxContextHelpButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+

 
 class ContextHelpButtonPtr(ContextHelpButton):
     def __init__(self, this):
 
 class ContextHelpButtonPtr(ContextHelpButton):
     def __init__(self, this):


@@ -2204,16 +4926,93 @@ class ContextHelpButtonPtr(ContextHelpButton):
 _controls.ContextHelpButton_swigregister(ContextHelpButtonPtr)
 
 class HelpProvider(object):
 _controls.ContextHelpButton_swigregister(ContextHelpButtonPtr)
 
 class HelpProvider(object):

-    Set = staticmethod(_controls.HelpProvider_Set)
-    Get = staticmethod(_controls.HelpProvider_Get)
-    def GetHelp(*args, **kwargs): return _controls.HelpProvider_GetHelp(*args, **kwargs)
-    def ShowHelp(*args, **kwargs): return _controls.HelpProvider_ShowHelp(*args, **kwargs)
-    def AddHelp(*args, **kwargs): return _controls.HelpProvider_AddHelp(*args, **kwargs)
-    def AddHelpById(*args, **kwargs): return _controls.HelpProvider_AddHelpById(*args, **kwargs)
-    def Destroy(*args, **kwargs): return _controls.HelpProvider_Destroy(*args, **kwargs)
+    """
+    wx.HelpProvider is an abstract class used by a program
+    implementing context-sensitive help to show the help text for the
+    given window.
+
+    The current help provider must be explicitly set by the
+    application using wx.HelpProvider.Set().
+    """

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

+    def Set(*args, **kwargs):
+        """
+        Set(HelpProvider helpProvider) -> HelpProvider
+
+        Sset the current, application-wide help provider. Returns the
+        previous one.  Unlike some other classes, the help provider is
+        not created on demand. This must be explicitly done by the
+        application.
+        """
+        return _controls.HelpProvider_Set(*args, **kwargs)
+
+    Set = staticmethod(Set)
+    def Get(*args, **kwargs):
+        """
+        Get() -> HelpProvider
+
+        Return the current application-wide help provider.
+        """
+        return _controls.HelpProvider_Get(*args, **kwargs)
+
+    Get = staticmethod(Get)
+    def GetHelp(*args, **kwargs):
+        """
+        GetHelp(Window window) -> String
+
+        Gets the help string for this window. Its interpretation is
+        dependent on the help provider except that empty string always
+        means that no help is associated with the window.
+        """
+        return _controls.HelpProvider_GetHelp(*args, **kwargs)
+
+    def ShowHelp(*args, **kwargs):
+        """
+        ShowHelp(Window window) -> bool
+
+        Shows help for the given window. Uses GetHelp internally if
+        applicable.
+
+        Returns true if it was done, or false if no help was available
+        for this window.
+        """
+        return _controls.HelpProvider_ShowHelp(*args, **kwargs)
+
+    def AddHelp(*args, **kwargs):
+        """
+        AddHelp(Window window, String text)
+
+        Associates the text with the given window.
+        """
+        return _controls.HelpProvider_AddHelp(*args, **kwargs)
+
+    def AddHelpById(*args, **kwargs):
+        """
+        AddHelpById(int id, String text)
+
+        This version associates the given text with all windows with this
+        id. May be used to set the same help string for all Cancel
+        buttons in the application, for example.
+        """
+        return _controls.HelpProvider_AddHelpById(*args, **kwargs)
+
+    def RemoveHelp(*args, **kwargs):
+        """
+        RemoveHelp(Window window)
+
+        Removes the association between the window pointer and the help
+        text. This is called by the wx.Window destructor. Without this,
+        the table of help strings will fill up and when window pointers
+        are reused, the wrong help string will be found.
+        """
+        return _controls.HelpProvider_RemoveHelp(*args, **kwargs)
+
+    def Destroy(*args, **kwargs):
+        """Destroy()"""
+        return _controls.HelpProvider_Destroy(*args, **kwargs)
+

 
 class HelpProviderPtr(HelpProvider):
     def __init__(self, this):
 
 class HelpProviderPtr(HelpProvider):
     def __init__(self, this):


@@ -2222,18 +5021,45 @@ class HelpProviderPtr(HelpProvider):
         self.__class__ = HelpProvider
 _controls.HelpProvider_swigregister(HelpProviderPtr)
 
         self.__class__ = HelpProvider
 _controls.HelpProvider_swigregister(HelpProviderPtr)
 

-HelpProvider_Set = _controls.HelpProvider_Set
+def HelpProvider_Set(*args, **kwargs):
+    """
+    HelpProvider_Set(HelpProvider helpProvider) -> HelpProvider
+
+    Sset the current, application-wide help provider. Returns the
+    previous one.  Unlike some other classes, the help provider is
+    not created on demand. This must be explicitly done by the
+    application.
+    """
+    return _controls.HelpProvider_Set(*args, **kwargs)
+
+def HelpProvider_Get(*args, **kwargs):
+    """
+    HelpProvider_Get() -> HelpProvider

 
 

-HelpProvider_Get = _controls.HelpProvider_Get
+    Return the current application-wide help provider.
+    """
+    return _controls.HelpProvider_Get(*args, **kwargs)

 
 class SimpleHelpProvider(HelpProvider):
 
 class SimpleHelpProvider(HelpProvider):

+    """
+    wx.SimpleHelpProvider is an implementation of wx.HelpProvider
+    which supports only plain text help strings, and shows the string
+    associated with the control (if any) in a tooltip.
+    """
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxSimpleHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

+        """
+        __init__() -> SimpleHelpProvider
+
+        wx.SimpleHelpProvider is an implementation of wx.HelpProvider
+        which supports only plain text help strings, and shows the string
+        associated with the control (if any) in a tooltip.
+        """

         newobj = _controls.new_SimpleHelpProvider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         newobj = _controls.new_SimpleHelpProvider(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSimpleHelpProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

 
 class SimpleHelpProviderPtr(SimpleHelpProvider):
     def __init__(self, this):
 
 class SimpleHelpProviderPtr(SimpleHelpProvider):
     def __init__(self, this):


@@ -2242,4 +5068,100 @@ class SimpleHelpProviderPtr(SimpleHelpProvider):
         self.__class__ = SimpleHelpProvider
 _controls.SimpleHelpProvider_swigregister(SimpleHelpProviderPtr)
 
         self.__class__ = SimpleHelpProvider
 _controls.SimpleHelpProvider_swigregister(SimpleHelpProviderPtr)
 

+#---------------------------------------------------------------------------
+
+class DragImage(core.Object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxGenericDragImage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(Bitmap image, Cursor cursor=wxNullCursor) -> DragImage"""
+        newobj = _controls.new_DragImage(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def __del__(self, destroy=_controls.delete_DragImage):
+        """__del__()"""
+        try:
+            if self.thisown: destroy(self)
+        except: pass
+
+    def SetBackingBitmap(*args, **kwargs):
+        """SetBackingBitmap(Bitmap bitmap)"""
+        return _controls.DragImage_SetBackingBitmap(*args, **kwargs)
+
+    def BeginDrag(*args, **kwargs):
+        """
+        BeginDrag(Point hotspot, Window window, bool fullScreen=False, 
+            Rect rect=None) -> bool
+        """
+        return _controls.DragImage_BeginDrag(*args, **kwargs)
+
+    def BeginDragBounded(*args, **kwargs):
+        """BeginDragBounded(Point hotspot, Window window, Window boundingWindow) -> bool"""
+        return _controls.DragImage_BeginDragBounded(*args, **kwargs)
+
+    def EndDrag(*args, **kwargs):
+        """EndDrag() -> bool"""
+        return _controls.DragImage_EndDrag(*args, **kwargs)
+
+    def Move(*args, **kwargs):
+        """Move(Point pt) -> bool"""
+        return _controls.DragImage_Move(*args, **kwargs)
+
+    def Show(*args, **kwargs):
+        """Show() -> bool"""
+        return _controls.DragImage_Show(*args, **kwargs)
+
+    def Hide(*args, **kwargs):
+        """Hide() -> bool"""
+        return _controls.DragImage_Hide(*args, **kwargs)
+
+    def GetImageRect(*args, **kwargs):
+        """GetImageRect(Point pos) -> Rect"""
+        return _controls.DragImage_GetImageRect(*args, **kwargs)
+
+    def DoDrawImage(*args, **kwargs):
+        """DoDrawImage(DC dc, Point pos) -> bool"""
+        return _controls.DragImage_DoDrawImage(*args, **kwargs)
+
+    def UpdateBackingFromWindow(*args, **kwargs):
+        """UpdateBackingFromWindow(DC windowDC, MemoryDC destDC, Rect sourceRect, Rect destRect) -> bool"""
+        return _controls.DragImage_UpdateBackingFromWindow(*args, **kwargs)
+
+    def RedrawImage(*args, **kwargs):
+        """RedrawImage(Point oldPos, Point newPos, bool eraseOld, bool drawNew) -> bool"""
+        return _controls.DragImage_RedrawImage(*args, **kwargs)
+
+
+class DragImagePtr(DragImage):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = DragImage
+_controls.DragImage_swigregister(DragImagePtr)
+
+def DragIcon(*args, **kwargs):
+    """DragIcon(Icon image, Cursor cursor=wxNullCursor) -> DragImage"""
+    val = _controls.new_DragIcon(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def DragString(*args, **kwargs):
+    """DragString(String str, Cursor cursor=wxNullCursor) -> DragImage"""
+    val = _controls.new_DragString(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def DragTreeItem(*args, **kwargs):
+    """DragTreeItem(TreeCtrl treeCtrl, TreeItemId id) -> DragImage"""
+    val = _controls.new_DragTreeItem(*args, **kwargs)
+    val.thisown = 1
+    return val
+
+def DragListItem(*args, **kwargs):
+    """DragListItem(ListCtrl listCtrl, long id) -> DragImage"""
+    val = _controls.new_DragListItem(*args, **kwargs)
+    val.thisown = 1
+    return val
+