A little different fix for how to delay the call to __wxCleanup

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

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index 67b775fe87d72e8df2ac587c96740d96291deef4..2e769952d82ef91fb7b92a02c00aa1168d6d8782 100644 (file)
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -33,15 +33,67 @@ class wxControl(wxControlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxControl,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreControl(*_args,**_kwargs):
     val = wxControlPtr(apply(controlsc.new_wxPreControl,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
+class wxControlWithItemsPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_Delete,(self,) + _args, _kwargs)
+        return val
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetCount,(self,) + _args, _kwargs)
+        return val
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetString,(self,) + _args, _kwargs)
+        return val
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_SetString,(self,) + _args, _kwargs)
+        return val
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_FindString,(self,) + _args, _kwargs)
+        return val
+    def Select(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_Select,(self,) + _args, _kwargs)
+        return val
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetSelection,(self,) + _args, _kwargs)
+        return val
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetStringSelection,(self,) + _args, _kwargs)
+        return val
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_Append,(self,) + _args, _kwargs)
+        return val
+    def GetClientData(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetClientData,(self,) + _args, _kwargs)
+        return val
+    def SetClientData(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_SetClientData,(self,) + _args, _kwargs)
+        return val
+    def AppendItems(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_AppendItems,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxControlWithItems instance at %s>" % (self.this,)
+    Number = GetCount
+class wxControlWithItems(wxControlWithItemsPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
 class wxButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
@@ -70,12 +122,14 @@ class wxButton(wxButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxButton,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreButton(*_args,**_kwargs):
     val = wxButtonPtr(apply(controlsc.new_wxPreButton,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -88,19 +142,19 @@ class wxBitmapButtonPtr(wxButtonPtr):
         return val
     def GetBitmapLabel(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapLabel,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def GetBitmapDisabled(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapDisabled,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def GetBitmapFocus(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapFocus,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def GetBitmapSelected(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapSelected,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def SetBitmapDisabled(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_SetBitmapDisabled,(self,) + _args, _kwargs)
@@ -129,12 +183,14 @@ class wxBitmapButton(wxBitmapButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreBitmapButton(*_args,**_kwargs):
     val = wxBitmapButtonPtr(apply(controlsc.new_wxPreBitmapButton,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -157,49 +213,30 @@ class wxCheckBox(wxCheckBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreCheckBox(*_args,**_kwargs):
     val = wxCheckBoxPtr(apply(controlsc.new_wxPreCheckBox,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
-class wxChoicePtr(wxControlPtr):
+class wxChoicePtr(wxControlWithItemsPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_Create,(self,) + _args, _kwargs)
         return val
-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Append,(self,) + _args, _kwargs)
-        return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)
         return val
-    def Delete(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Delete,(self,) + _args, _kwargs)
-        return val
-    def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_FindString,(self,) + _args, _kwargs)
-        return val
     def GetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs)
         return val
-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetSelection,(self,) + _args, _kwargs)
-        return val
-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetString,(self,) + _args, _kwargs)
-        return val
-    def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetStringSelection,(self,) + _args, _kwargs)
-        return val
-    def GetCount(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetCount,(self,) + _args, _kwargs)
-        return val
     def SetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
         return val
@@ -215,19 +252,20 @@ class wxChoicePtr(wxControlPtr):
     def __repr__(self):
         return "<C wxChoice instance at %s>" % (self.this,)
     
-    Number = GetCount
     Select = SetSelection
     
 class wxChoice(wxChoicePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxChoice,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreChoice(*_args,**_kwargs):
     val = wxChoicePtr(apply(controlsc.new_wxPreChoice,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -238,39 +276,18 @@ class wxComboBoxPtr(wxChoicePtr):
     def Create(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Create,(self,) + _args, _kwargs)
         return val
-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Append,(self,) + _args, _kwargs)
-        return val
-    def Clear(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Clear,(self,) + _args, _kwargs)
-        return val
     def Copy(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)
         return val
     def Cut(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs)
         return val
-    def Delete(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Delete,(self,) + _args, _kwargs)
-        return val
-    def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_FindString,(self,) + _args, _kwargs)
-        return val
     def GetInsertionPoint(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs)
         return val
     def GetLastPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs)
         return val
-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetSelection,(self,) + _args, _kwargs)
-        return val
-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetString,(self,) + _args, _kwargs)
-        return val
-    def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetStringSelection,(self,) + _args, _kwargs)
-        return val
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)
         return val
@@ -307,12 +324,14 @@ class wxComboBox(wxComboBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxComboBox,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreComboBox(*_args,**_kwargs):
     val = wxComboBoxPtr(apply(controlsc.new_wxPreComboBox,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -353,12 +372,14 @@ class wxGauge(wxGaugePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxGauge,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreGauge(*_args,**_kwargs):
     val = wxGaugePtr(apply(controlsc.new_wxPreGauge,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -375,12 +396,14 @@ class wxStaticBox(wxStaticBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticBox,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticBox(*_args,**_kwargs):
     val = wxStaticBoxPtr(apply(controlsc.new_wxPreStaticBox,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -397,12 +420,14 @@ class wxStaticLine(wxStaticLinePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticLine,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticLine(*_args,**_kwargs):
     val = wxStaticLinePtr(apply(controlsc.new_wxPreStaticLine,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -425,55 +450,36 @@ class wxStaticText(wxStaticTextPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticText,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticText(*_args,**_kwargs):
     val = wxStaticTextPtr(apply(controlsc.new_wxPreStaticText,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
-class wxListBoxPtr(wxControlPtr):
+class wxListBoxPtr(wxControlWithItemsPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Create,(self,) + _args, _kwargs)
         return val
-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Append,(self,) + _args, _kwargs)
-        return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs)
         return val
-    def Delete(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Delete,(self,) + _args, _kwargs)
-        return val
     def Deselect(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs)
         return val
-    def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_FindString,(self,) + _args, _kwargs)
-        return val
-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetSelection,(self,) + _args, _kwargs)
-        return val
     def GetSelections(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs)
         return val
     def InsertItems(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs)
         return val
-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetString,(self,) + _args, _kwargs)
-        return val
-    def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetStringSelection,(self,) + _args, _kwargs)
-        return val
-    def GetCount(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetCount,(self,) + _args, _kwargs)
-        return val
     def IsSelected(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs)
         return val
@@ -500,17 +506,18 @@ class wxListBoxPtr(wxControlPtr):
         return val
     def __repr__(self):
         return "<C wxListBox instance at %s>" % (self.this,)
-    Number = GetCount
 class wxListBox(wxListBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreListBox(*_args,**_kwargs):
     val = wxListBoxPtr(apply(controlsc.new_wxPreListBox,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -539,12 +546,14 @@ class wxCheckListBox(wxCheckListBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreCheckListBox(*_args,**_kwargs):
     val = wxCheckListBoxPtr(apply(controlsc.new_wxPreCheckListBox,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -575,15 +584,18 @@ class wxTextAttrPtr :
         return val
     def GetTextColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_GetTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
     def GetBackgroundColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_GetBackgroundColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
     def GetFont(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_GetFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
+        if val: val = wxFontPtr(val) ; val.thisown = 1
+        return val
+    def IsDefault(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_IsDefault,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxTextAttr instance at %s>" % (self.this,)
@@ -602,23 +614,14 @@ class wxTextCtrlPtr(wxControlPtr):
     def Create(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_Create,(self,) + _args, _kwargs)
         return val
-    def Clear(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs)
-        return val
-    def Copy(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Copy,(self,) + _args, _kwargs)
-        return val
-    def Cut(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Cut,(self,) + _args, _kwargs)
-        return val
-    def DiscardEdits(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_DiscardEdits,(self,) + _args, _kwargs)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetValue,(self,) + _args, _kwargs)
         return val
-    def GetInsertionPoint(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetInsertionPoint,(self,) + _args, _kwargs)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)
         return val
-    def GetLastPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetLastPosition,(self,) + _args, _kwargs)
+    def GetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetRange,(self,) + _args, _kwargs)
         return val
     def GetLineLength(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)
@@ -629,47 +632,38 @@ class wxTextCtrlPtr(wxControlPtr):
     def GetNumberOfLines(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_GetNumberOfLines,(self,) + _args, _kwargs)
         return val
-    def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetValue,(self,) + _args, _kwargs)
-        return val
     def IsModified(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_IsModified,(self,) + _args, _kwargs)
         return val
-    def LoadFile(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_LoadFile,(self,) + _args, _kwargs)
+    def IsEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsEditable,(self,) + _args, _kwargs)
         return val
-    def Paste(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Paste,(self,) + _args, _kwargs)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs)
         return val
-    def PositionToXY(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_PositionToXY,(self,) + _args, _kwargs)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetStringSelection,(self,) + _args, _kwargs)
         return val
-    def Remove(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Remove,(self,) + _args, _kwargs)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs)
         return val
     def Replace(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_Replace,(self,) + _args, _kwargs)
         return val
-    def SaveFile(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs)
-        return val
-    def SetEditable(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)
-        return val
-    def SetInsertionPoint(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs)
+    def Remove(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Remove,(self,) + _args, _kwargs)
         return val
-    def SetInsertionPointEnd(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_LoadFile,(self,) + _args, _kwargs)
         return val
-    def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs)
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs)
         return val
-    def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)
+    def DiscardEdits(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_DiscardEdits,(self,) + _args, _kwargs)
         return val
-    def ShowPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs)
+    def SetMaxLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetMaxLength,(self,) + _args, _kwargs)
         return val
     def WriteText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_WriteText,(self,) + _args, _kwargs)
@@ -677,9 +671,34 @@ class wxTextCtrlPtr(wxControlPtr):
     def AppendText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)
         return val
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
+        return val
+    def SetDefaultStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetDefaultStyle,(self,) + _args, _kwargs)
+        return val
+    def GetDefaultStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetDefaultStyle,(self,) + _args, _kwargs)
+        if val: val = wxTextAttrPtr(val) 
+        return val
     def XYToPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_XYToPosition,(self,) + _args, _kwargs)
         return val
+    def PositionToXY(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_PositionToXY,(self,) + _args, _kwargs)
+        return val
+    def ShowPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs)
+        return val
+    def Copy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Copy,(self,) + _args, _kwargs)
+        return val
+    def Cut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Cut,(self,) + _args, _kwargs)
+        return val
+    def Paste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Paste,(self,) + _args, _kwargs)
+        return val
     def CanCopy(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanCopy,(self,) + _args, _kwargs)
         return val
@@ -689,52 +708,59 @@ class wxTextCtrlPtr(wxControlPtr):
     def CanPaste(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanPaste,(self,) + _args, _kwargs)
         return val
-    def CanRedo(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_CanRedo,(self,) + _args, _kwargs)
+    def Undo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Undo,(self,) + _args, _kwargs)
+        return val
+    def Redo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Redo,(self,) + _args, _kwargs)
         return val
     def CanUndo(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanUndo,(self,) + _args, _kwargs)
         return val
-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs)
+    def CanRedo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanRedo,(self,) + _args, _kwargs)
         return val
-    def IsEditable(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_IsEditable,(self,) + _args, _kwargs)
+    def SetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs)
         return val
-    def Undo(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Undo,(self,) + _args, _kwargs)
+    def SetInsertionPointEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs)
         return val
-    def Redo(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Redo,(self,) + _args, _kwargs)
+    def GetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetInsertionPoint,(self,) + _args, _kwargs)
         return val
-    def SetStyle(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
+    def GetLastPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetLastPosition,(self,) + _args, _kwargs)
         return val
-    def SetDefaultStyle(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetDefaultStyle,(self,) + _args, _kwargs)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs)
         return val
-    def GetDefaultStyle(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetDefaultStyle,(self,) + _args, _kwargs)
-        if val: val = wxTextAttrPtr(val) 
+    def SelectAll(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SelectAll,(self,) + _args, _kwargs)
         return val
-    def SetMaxLength(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetMaxLength,(self,) + _args, _kwargs)
+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)
         return val
     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
         return val
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetString,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxTextCtrl instance at %s>" % (self.this,)
 class wxTextCtrl(wxTextCtrlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreTextCtrl(*_args,**_kwargs):
     val = wxTextCtrlPtr(apply(controlsc.new_wxPreTextCtrl,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -760,6 +786,9 @@ class wxScrollBarPtr(wxControlPtr):
     def GetThumbLength(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_GetThumbLength,(self,) + _args, _kwargs)
         return val
+    def IsVertical(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_IsVertical,(self,) + _args, _kwargs)
+        return val
     def SetThumbPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)
         return val
@@ -772,12 +801,14 @@ class wxScrollBar(wxScrollBarPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreScrollBar(*_args,**_kwargs):
     val = wxScrollBarPtr(apply(controlsc.new_wxPreScrollBar,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -809,12 +840,14 @@ class wxSpinButton(wxSpinButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSpinButton,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreSpinButton(*_args,**_kwargs):
     val = wxSpinButtonPtr(apply(controlsc.new_wxPreSpinButton,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -827,7 +860,7 @@ class wxStaticBitmapPtr(wxControlPtr):
         return val
     def GetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def SetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs)
@@ -841,12 +874,14 @@ class wxStaticBitmap(wxStaticBitmapPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticBitmap(*_args,**_kwargs):
     val = wxStaticBitmapPtr(apply(controlsc.new_wxPreStaticBitmap,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -910,12 +945,14 @@ class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreRadioBox(*_args,**_kwargs):
     val = wxRadioBoxPtr(apply(controlsc.new_wxPreRadioBox,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -938,12 +975,14 @@ class wxRadioButton(wxRadioButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreRadioButton(*_args,**_kwargs):
     val = wxRadioButtonPtr(apply(controlsc.new_wxPreRadioButton,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -1017,12 +1056,14 @@ class wxSlider(wxSliderPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSlider,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreSlider(*_args,**_kwargs):
     val = wxSliderPtr(apply(controlsc.new_wxPreSlider,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -1054,12 +1095,14 @@ class wxSpinCtrl(wxSpinCtrlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSpinCtrl,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreSpinCtrl(*_args,**_kwargs):
     val = wxSpinCtrlPtr(apply(controlsc.new_wxPreSpinCtrl,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -1085,12 +1128,14 @@ class wxToggleButton(wxToggleButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxToggleButton,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreToggleButton(*_args,**_kwargs):
     val = wxToggleButtonPtr(apply(controlsc.new_wxPreToggleButton,_args,_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -1103,6 +1148,11 @@ def wxButton_GetDefaultSize(*_args, **_kwargs):
     if val: val = wxSizePtr(val); val.thisown = 1
     return val
 
+def wxTextAttr_Combine(*_args, **_kwargs):
+    val = apply(controlsc.wxTextAttr_Combine,_args,_kwargs)
+    if val: val = wxTextAttrPtr(val); val.thisown = 1
+    return val
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------