X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/900d98862dc265f24943f60074d8b69025331737..71aba8333cc915afff9e740c944f7fa7247abacb:/wxPython/src/msw/controls.py

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index 3e01f54cbf..61f799a140 100644
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
@@ -16,29 +18,31 @@ class wxControlPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControl_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxControl_Create(self, *_args, **_kwargs)
         return val
     def Command(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControl_Command,(self,) + _args, _kwargs)
+        val = controlsc.wxControl_Command(self, *_args, **_kwargs)
         return val
     def GetLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControl_GetLabel,(self,) + _args, _kwargs)
+        val = controlsc.wxControl_GetLabel(self, *_args, **_kwargs)
         return val
     def SetLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControl_SetLabel,(self,) + _args, _kwargs)
+        val = controlsc.wxControl_SetLabel(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxControl instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxControl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxControl(wxControlPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxControl,_args,_kwargs)
+        self.this = controlsc.new_wxControl(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreControl(*_args,**_kwargs):
-    val = wxControlPtr(apply(controlsc.new_wxPreControl,_args,_kwargs))
+    val = wxControlPtr(controlsc.new_wxPreControl(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -47,40 +51,43 @@ class wxControlWithItemsPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Delete(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_Delete,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_Delete(self, *_args, **_kwargs)
         return val
     def GetCount(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_GetCount,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_GetCount(self, *_args, **_kwargs)
         return val
     def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_GetString,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_GetString(self, *_args, **_kwargs)
         return val
     def SetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_SetString,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_SetString(self, *_args, **_kwargs)
         return val
     def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_FindString,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_FindString(self, *_args, **_kwargs)
         return val
     def Select(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_Select,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_Select(self, *_args, **_kwargs)
         return val
     def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_GetSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_GetSelection(self, *_args, **_kwargs)
         return val
     def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_GetStringSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_GetStringSelection(self, *_args, **_kwargs)
         return val
     def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_Append,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_Append(self, *_args, **_kwargs)
         return val
     def GetClientData(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_GetClientData,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_GetClientData(self, *_args, **_kwargs)
         return val
     def SetClientData(self, *_args, **_kwargs):
-        val = apply(controlsc.wxControlWithItems_SetClientData,(self,) + _args, _kwargs)
+        val = controlsc.wxControlWithItems_SetClientData(self, *_args, **_kwargs)
+        return val
+    def AppendItems(self, *_args, **_kwargs):
+        val = controlsc.wxControlWithItems_AppendItems(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxControlWithItems instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxControlWithItems instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     Number = GetCount
 class wxControlWithItems(wxControlWithItemsPtr):
     def __init__(self,this):
@@ -94,35 +101,37 @@ class wxButtonPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxButton_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxButton_Create(self, *_args, **_kwargs)
         return val
     def SetDefault(self, *_args, **_kwargs):
-        val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs)
+        val = controlsc.wxButton_SetDefault(self, *_args, **_kwargs)
         return val
     def SetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(controlsc.wxButton_SetBackgroundColour,(self,) + _args, _kwargs)
+        val = controlsc.wxButton_SetBackgroundColour(self, *_args, **_kwargs)
         return val
     def SetForegroundColour(self, *_args, **_kwargs):
-        val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs)
+        val = controlsc.wxButton_SetForegroundColour(self, *_args, **_kwargs)
         return val
     def SetImageLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxButton_SetImageLabel,(self,) + _args, _kwargs)
+        val = controlsc.wxButton_SetImageLabel(self, *_args, **_kwargs)
         return val
     def SetImageMargins(self, *_args, **_kwargs):
-        val = apply(controlsc.wxButton_SetImageMargins,(self,) + _args, _kwargs)
+        val = controlsc.wxButton_SetImageMargins(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxButton instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxButton(wxButtonPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxButton,_args,_kwargs)
+        self.this = controlsc.new_wxButton(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreButton(*_args,**_kwargs):
-    val = wxButtonPtr(apply(controlsc.new_wxPreButton,_args,_kwargs))
+    val = wxButtonPtr(controlsc.new_wxPreButton(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -131,57 +140,59 @@ class wxBitmapButtonPtr(wxButtonPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_Create(self, *_args, **_kwargs)
         return val
     def GetBitmapLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_GetBitmapLabel,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
+        val = controlsc.wxBitmapButton_GetBitmapLabel(self, *_args, **_kwargs)
+        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) 
+        val = controlsc.wxBitmapButton_GetBitmapDisabled(self, *_args, **_kwargs)
+        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) 
+        val = controlsc.wxBitmapButton_GetBitmapFocus(self, *_args, **_kwargs)
+        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) 
+        val = controlsc.wxBitmapButton_GetBitmapSelected(self, *_args, **_kwargs)
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def SetBitmapDisabled(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_SetBitmapDisabled,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_SetBitmapDisabled(self, *_args, **_kwargs)
         return val
     def SetBitmapFocus(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_SetBitmapFocus,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_SetBitmapFocus(self, *_args, **_kwargs)
         return val
     def SetBitmapSelected(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_SetBitmapSelected,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_SetBitmapSelected(self, *_args, **_kwargs)
         return val
     def SetBitmapLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_SetBitmapLabel,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_SetBitmapLabel(self, *_args, **_kwargs)
         return val
     def SetMargins(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_SetMargins,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_SetMargins(self, *_args, **_kwargs)
         return val
     def GetMarginX(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_GetMarginX,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_GetMarginX(self, *_args, **_kwargs)
         return val
     def GetMarginY(self, *_args, **_kwargs):
-        val = apply(controlsc.wxBitmapButton_GetMarginY,(self,) + _args, _kwargs)
+        val = controlsc.wxBitmapButton_GetMarginY(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxBitmapButton instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxBitmapButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxBitmapButton(wxBitmapButtonPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs)
+        self.this = controlsc.new_wxBitmapButton(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreBitmapButton(*_args,**_kwargs):
-    val = wxBitmapButtonPtr(apply(controlsc.new_wxPreBitmapButton,_args,_kwargs))
+    val = wxBitmapButtonPtr(controlsc.new_wxPreBitmapButton(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -190,26 +201,31 @@ class wxCheckBoxPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckBox_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckBox_Create(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckBox_GetValue(self, *_args, **_kwargs)
+        return val
+    def IsChecked(self, *_args, **_kwargs):
+        val = controlsc.wxCheckBox_IsChecked(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckBox_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckBox_SetValue(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxCheckBox instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxCheckBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxCheckBox(wxCheckBoxPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs)
+        self.this = controlsc.new_wxCheckBox(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreCheckBox(*_args,**_kwargs):
-    val = wxCheckBoxPtr(apply(controlsc.new_wxPreCheckBox,_args,_kwargs))
+    val = wxCheckBoxPtr(controlsc.new_wxPreCheckBox(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -218,41 +234,43 @@ class wxChoicePtr(wxControlWithItemsPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxChoice_Create(self, *_args, **_kwargs)
         return val
     def Clear(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)
+        val = controlsc.wxChoice_Clear(self, *_args, **_kwargs)
         return val
     def GetColumns(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs)
+        val = controlsc.wxChoice_GetColumns(self, *_args, **_kwargs)
         return val
     def SetColumns(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
+        val = controlsc.wxChoice_SetColumns(self, *_args, **_kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_SetSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxChoice_SetSelection(self, *_args, **_kwargs)
         return val
     def SetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxChoice_SetStringSelection(self, *_args, **_kwargs)
         return val
     def SetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_SetString,(self,) + _args, _kwargs)
+        val = controlsc.wxChoice_SetString(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxChoice instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxChoice instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     Select = SetSelection
     
 class wxChoice(wxChoicePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxChoice,_args,_kwargs)
+        self.this = controlsc.new_wxChoice(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreChoice(*_args,**_kwargs):
-    val = wxChoicePtr(apply(controlsc.new_wxPreChoice,_args,_kwargs))
+    val = wxChoicePtr(controlsc.new_wxPreChoice(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -261,62 +279,64 @@ class wxComboBoxPtr(wxChoicePtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_Create(self, *_args, **_kwargs)
         return val
     def Copy(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_Copy(self, *_args, **_kwargs)
         return val
     def Cut(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_Cut(self, *_args, **_kwargs)
         return val
     def GetInsertionPoint(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_GetInsertionPoint(self, *_args, **_kwargs)
         return val
     def GetLastPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_GetLastPosition(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_GetValue(self, *_args, **_kwargs)
         return val
     def Paste(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_Paste(self, *_args, **_kwargs)
         return val
     def Replace(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Replace,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_Replace(self, *_args, **_kwargs)
         return val
     def Remove(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Remove,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_Remove(self, *_args, **_kwargs)
         return val
     def SetInsertionPoint(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_SetInsertionPoint,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_SetInsertionPoint(self, *_args, **_kwargs)
         return val
     def SetInsertionPointEnd(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_SetInsertionPointEnd,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_SetInsertionPointEnd(self, *_args, **_kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_SetSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_SetSelection(self, *_args, **_kwargs)
         return val
     def SetMark(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_SetMark,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_SetMark(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_SetValue(self, *_args, **_kwargs)
         return val
     def SetEditable(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_SetEditable,(self,) + _args, _kwargs)
+        val = controlsc.wxComboBox_SetEditable(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxComboBox instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxComboBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxComboBox(wxComboBoxPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxComboBox,_args,_kwargs)
+        self.this = controlsc.new_wxComboBox(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreComboBox(*_args,**_kwargs):
-    val = wxComboBoxPtr(apply(controlsc.new_wxPreComboBox,_args,_kwargs))
+    val = wxComboBoxPtr(controlsc.new_wxPreComboBox(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -325,44 +345,46 @@ class wxGaugePtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_Create(self, *_args, **_kwargs)
         return val
     def GetBezelFace(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_GetBezelFace,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_GetBezelFace(self, *_args, **_kwargs)
         return val
     def GetRange(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_GetRange,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_GetRange(self, *_args, **_kwargs)
         return val
     def GetShadowWidth(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_GetShadowWidth,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_GetShadowWidth(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_GetValue(self, *_args, **_kwargs)
         return val
     def SetBezelFace(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_SetBezelFace,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_SetBezelFace(self, *_args, **_kwargs)
         return val
     def SetRange(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_SetRange,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_SetRange(self, *_args, **_kwargs)
         return val
     def SetShadowWidth(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_SetShadowWidth,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_SetShadowWidth(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxGauge_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxGauge_SetValue(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxGauge instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxGauge instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxGauge(wxGaugePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxGauge,_args,_kwargs)
+        self.this = controlsc.new_wxGauge(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreGauge(*_args,**_kwargs):
-    val = wxGaugePtr(apply(controlsc.new_wxPreGauge,_args,_kwargs))
+    val = wxGaugePtr(controlsc.new_wxPreGauge(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -371,20 +393,22 @@ class wxStaticBoxPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticBox_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticBox_Create(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxStaticBox instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxStaticBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxStaticBox(wxStaticBoxPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxStaticBox,_args,_kwargs)
+        self.this = controlsc.new_wxStaticBox(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticBox(*_args,**_kwargs):
-    val = wxStaticBoxPtr(apply(controlsc.new_wxPreStaticBox,_args,_kwargs))
+    val = wxStaticBoxPtr(controlsc.new_wxPreStaticBox(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -393,20 +417,22 @@ class wxStaticLinePtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticLine_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticLine_Create(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxStaticLine instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxStaticLine instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxStaticLine(wxStaticLinePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxStaticLine,_args,_kwargs)
+        self.this = controlsc.new_wxStaticLine(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticLine(*_args,**_kwargs):
-    val = wxStaticLinePtr(apply(controlsc.new_wxPreStaticLine,_args,_kwargs))
+    val = wxStaticLinePtr(controlsc.new_wxPreStaticLine(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -415,26 +441,28 @@ class wxStaticTextPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticText_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticText_Create(self, *_args, **_kwargs)
         return val
     def GetLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticText_GetLabel,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticText_GetLabel(self, *_args, **_kwargs)
         return val
     def SetLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticText_SetLabel,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticText_SetLabel(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxStaticText instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxStaticText instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxStaticText(wxStaticTextPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxStaticText,_args,_kwargs)
+        self.this = controlsc.new_wxStaticText(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticText(*_args,**_kwargs):
-    val = wxStaticTextPtr(apply(controlsc.new_wxPreStaticText,_args,_kwargs))
+    val = wxStaticTextPtr(controlsc.new_wxPreStaticText(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -443,56 +471,58 @@ class wxListBoxPtr(wxControlWithItemsPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_Create(self, *_args, **_kwargs)
         return val
     def Clear(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_Clear(self, *_args, **_kwargs)
         return val
     def Deselect(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_Deselect(self, *_args, **_kwargs)
         return val
     def GetSelections(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_GetSelections(self, *_args, **_kwargs)
         return val
     def InsertItems(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_InsertItems(self, *_args, **_kwargs)
         return val
     def IsSelected(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_IsSelected(self, *_args, **_kwargs)
         return val
     def Selected(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_Selected(self, *_args, **_kwargs)
         return val
     def Set(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Set,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_Set(self, *_args, **_kwargs)
         return val
     def SetFirstItem(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_SetFirstItem,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_SetFirstItem(self, *_args, **_kwargs)
         return val
     def SetFirstItemStr(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_SetFirstItemStr,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_SetFirstItemStr(self, *_args, **_kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_SetSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_SetSelection(self, *_args, **_kwargs)
         return val
     def SetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_SetString,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_SetString(self, *_args, **_kwargs)
         return val
     def SetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_SetStringSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxListBox_SetStringSelection(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxListBox instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxListBox(wxListBoxPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
+        self.this = controlsc.new_wxListBox(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreListBox(*_args,**_kwargs):
-    val = wxListBoxPtr(apply(controlsc.new_wxPreListBox,_args,_kwargs))
+    val = wxListBoxPtr(controlsc.new_wxPreListBox(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -501,32 +531,40 @@ class wxCheckListBoxPtr(wxListBoxPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckListBox_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckListBox_Create(self, *_args, **_kwargs)
         return val
     def IsChecked(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckListBox_IsChecked,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckListBox_IsChecked(self, *_args, **_kwargs)
         return val
     def Check(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckListBox_Check,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckListBox_Check(self, *_args, **_kwargs)
         return val
     def InsertItems(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckListBox_InsertItems,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckListBox_InsertItems(self, *_args, **_kwargs)
         return val
     def GetItemHeight(self, *_args, **_kwargs):
-        val = apply(controlsc.wxCheckListBox_GetItemHeight,(self,) + _args, _kwargs)
+        val = controlsc.wxCheckListBox_GetItemHeight(self, *_args, **_kwargs)
+        return val
+    def HitTest(self, *_args, **_kwargs):
+        val = controlsc.wxCheckListBox_HitTest(self, *_args, **_kwargs)
+        return val
+    def HitTestXY(self, *_args, **_kwargs):
+        val = controlsc.wxCheckListBox_HitTestXY(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxCheckListBox instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxCheckListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxCheckListBox(wxCheckListBoxPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs)
+        self.this = controlsc.new_wxCheckListBox(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreCheckListBox(*_args,**_kwargs):
-    val = wxCheckListBoxPtr(apply(controlsc.new_wxPreCheckListBox,_args,_kwargs))
+    val = wxCheckListBoxPtr(controlsc.new_wxPreCheckListBox(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -534,44 +572,98 @@ class wxTextAttrPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,controlsc=controlsc):
-        if self.thisown == 1 :
-            controlsc.delete_wxTextAttr(self)
+    def __del__(self, delfunc=controlsc.delete_wxTextAttr):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
+    def Init(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_Init(self, *_args, **_kwargs)
+        return val
     def SetTextColour(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)
+        val = controlsc.wxTextAttr_SetTextColour(self, *_args, **_kwargs)
         return val
     def SetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextAttr_SetBackgroundColour,(self,) + _args, _kwargs)
+        val = controlsc.wxTextAttr_SetBackgroundColour(self, *_args, **_kwargs)
         return val
     def SetFont(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextAttr_SetFont,(self,) + _args, _kwargs)
+        val = controlsc.wxTextAttr_SetFont(self, *_args, **_kwargs)
+        return val
+    def SetAlignment(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_SetAlignment(self, *_args, **_kwargs)
+        return val
+    def SetTabs(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_SetTabs(self, *_args, **_kwargs)
+        return val
+    def SetLeftIndent(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_SetLeftIndent(self, *_args, **_kwargs)
+        return val
+    def SetRightIndent(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_SetRightIndent(self, *_args, **_kwargs)
+        return val
+    def SetFlags(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_SetFlags(self, *_args, **_kwargs)
         return val
     def HasTextColour(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextAttr_HasTextColour,(self,) + _args, _kwargs)
+        val = controlsc.wxTextAttr_HasTextColour(self, *_args, **_kwargs)
         return val
     def HasBackgroundColour(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextAttr_HasBackgroundColour,(self,) + _args, _kwargs)
+        val = controlsc.wxTextAttr_HasBackgroundColour(self, *_args, **_kwargs)
         return val
     def HasFont(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextAttr_HasFont,(self,) + _args, _kwargs)
+        val = controlsc.wxTextAttr_HasFont(self, *_args, **_kwargs)
+        return val
+    def HasAlignment(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_HasAlignment(self, *_args, **_kwargs)
+        return val
+    def HasTabs(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_HasTabs(self, *_args, **_kwargs)
+        return val
+    def HasLeftIndent(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_HasLeftIndent(self, *_args, **_kwargs)
+        return val
+    def HasRightIndent(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_HasRightIndent(self, *_args, **_kwargs)
+        return val
+    def HasFlag(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_HasFlag(self, *_args, **_kwargs)
         return val
     def GetTextColour(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextAttr_GetTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
+        val = controlsc.wxTextAttr_GetTextColour(self, *_args, **_kwargs)
+        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) 
+        val = controlsc.wxTextAttr_GetBackgroundColour(self, *_args, **_kwargs)
+        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) 
+        val = controlsc.wxTextAttr_GetFont(self, *_args, **_kwargs)
+        if val: val = wxFontPtr(val) ; val.thisown = 1
+        return val
+    def GetAlignment(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_GetAlignment(self, *_args, **_kwargs)
+        return val
+    def GetTabs(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_GetTabs(self, *_args, **_kwargs)
+        return val
+    def GetLeftIndent(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_GetLeftIndent(self, *_args, **_kwargs)
+        return val
+    def GetRightIndent(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_GetRightIndent(self, *_args, **_kwargs)
+        return val
+    def GetFlags(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_GetFlags(self, *_args, **_kwargs)
+        return val
+    def IsDefault(self, *_args, **_kwargs):
+        val = controlsc.wxTextAttr_IsDefault(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxTextAttr instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxTextAttr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxTextAttr(wxTextAttrPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxTextAttr,_args,_kwargs)
+        self.this = controlsc.new_wxTextAttr(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -582,141 +674,167 @@ class wxTextCtrlPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     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)
+        val = controlsc.wxTextCtrl_Create(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 = 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 = 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 = controlsc.wxTextCtrl_GetRange(self, *_args, **_kwargs)
         return val
     def GetLineLength(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_GetLineLength(self, *_args, **_kwargs)
         return val
     def GetLineText(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetLineText,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_GetLineText(self, *_args, **_kwargs)
         return val
     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)
+        val = controlsc.wxTextCtrl_GetNumberOfLines(self, *_args, **_kwargs)
         return val
     def IsModified(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_IsModified,(self,) + _args, _kwargs)
+        val = 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 = 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 = 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 = 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 = controlsc.wxTextCtrl_Clear(self, *_args, **_kwargs)
         return val
     def Replace(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Replace,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_Replace(self, *_args, **_kwargs)
+        return val
+    def Remove(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_Remove(self, *_args, **_kwargs)
+        return val
+    def LoadFile(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_LoadFile(self, *_args, **_kwargs)
         return val
     def SaveFile(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_SaveFile(self, *_args, **_kwargs)
         return val
-    def SetEditable(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)
+    def DiscardEdits(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_DiscardEdits(self, *_args, **_kwargs)
         return val
-    def SetInsertionPoint(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs)
+    def SetMaxLength(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_SetMaxLength(self, *_args, **_kwargs)
         return val
-    def SetInsertionPointEnd(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs)
+    def WriteText(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_WriteText(self, *_args, **_kwargs)
         return val
-    def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs)
+    def AppendText(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_AppendText(self, *_args, **_kwargs)
         return val
-    def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)
+    def EmulateKeyPress(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_EmulateKeyPress(self, *_args, **_kwargs)
         return val
-    def ShowPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs)
+    def SetStyle(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_SetStyle(self, *_args, **_kwargs)
         return val
-    def WriteText(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_WriteText,(self,) + _args, _kwargs)
+    def SetDefaultStyle(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_SetDefaultStyle(self, *_args, **_kwargs)
         return val
-    def AppendText(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)
+    def GetDefaultStyle(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_GetDefaultStyle(self, *_args, **_kwargs)
+        if val: val = wxTextAttrPtr(val) 
+        return val
+    def GetStyle(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_GetStyle(self, *_args, **_kwargs)
         return val
     def XYToPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_XYToPosition,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_XYToPosition(self, *_args, **_kwargs)
+        return val
+    def PositionToXY(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_PositionToXY(self, *_args, **_kwargs)
+        return val
+    def ShowPosition(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_ShowPosition(self, *_args, **_kwargs)
+        return val
+    def Copy(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_Copy(self, *_args, **_kwargs)
+        return val
+    def Cut(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_Cut(self, *_args, **_kwargs)
+        return val
+    def Paste(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_Paste(self, *_args, **_kwargs)
         return val
     def CanCopy(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_CanCopy,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_CanCopy(self, *_args, **_kwargs)
         return val
     def CanCut(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_CanCut,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_CanCut(self, *_args, **_kwargs)
         return val
     def CanPaste(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_CanPaste,(self,) + _args, _kwargs)
+        val = 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 = controlsc.wxTextCtrl_Undo(self, *_args, **_kwargs)
+        return val
+    def Redo(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_Redo(self, *_args, **_kwargs)
         return val
     def CanUndo(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_CanUndo,(self,) + _args, _kwargs)
+        val = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = controlsc.wxTextCtrl_SetEditable(self, *_args, **_kwargs)
+        return val
+    def IsSingleLine(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_IsSingleLine(self, *_args, **_kwargs)
+        return val
+    def IsMultiLine(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_IsMultiLine(self, *_args, **_kwargs)
         return val
     def write(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
+        val = controlsc.wxTextCtrl_write(self, *_args, **_kwargs)
+        return val
+    def GetString(self, *_args, **_kwargs):
+        val = controlsc.wxTextCtrl_GetString(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxTextCtrl instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxTextCtrl(wxTextCtrlPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs)
+        self.this = controlsc.new_wxTextCtrl(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreTextCtrl(*_args,**_kwargs):
-    val = wxTextCtrlPtr(apply(controlsc.new_wxPreTextCtrl,_args,_kwargs))
+    val = wxTextCtrlPtr(controlsc.new_wxPreTextCtrl(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -725,41 +843,46 @@ class wxScrollBarPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_Create(self, *_args, **_kwargs)
         return val
     def GetRange(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_GetRange,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_GetRange(self, *_args, **_kwargs)
         return val
     def GetPageSize(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_GetPageSize,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_GetPageSize(self, *_args, **_kwargs)
         return val
     def GetThumbPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_GetThumbPosition,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_GetThumbPosition(self, *_args, **_kwargs)
         return val
     def GetThumbSize(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_GetThumbSize,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_GetThumbSize(self, *_args, **_kwargs)
         return val
     def GetThumbLength(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_GetThumbLength,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_GetThumbLength(self, *_args, **_kwargs)
+        return val
+    def IsVertical(self, *_args, **_kwargs):
+        val = controlsc.wxScrollBar_IsVertical(self, *_args, **_kwargs)
         return val
     def SetThumbPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_SetThumbPosition(self, *_args, **_kwargs)
         return val
     def SetScrollbar(self, *_args, **_kwargs):
-        val = apply(controlsc.wxScrollBar_SetScrollbar,(self,) + _args, _kwargs)
+        val = controlsc.wxScrollBar_SetScrollbar(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxScrollBar instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxScrollBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxScrollBar(wxScrollBarPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs)
+        self.this = controlsc.new_wxScrollBar(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreScrollBar(*_args,**_kwargs):
-    val = wxScrollBarPtr(apply(controlsc.new_wxPreScrollBar,_args,_kwargs))
+    val = wxScrollBarPtr(controlsc.new_wxPreScrollBar(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -768,35 +891,37 @@ class wxSpinButtonPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinButton_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinButton_Create(self, *_args, **_kwargs)
         return val
     def GetMax(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinButton_GetMax,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinButton_GetMax(self, *_args, **_kwargs)
         return val
     def GetMin(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinButton_GetMin,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinButton_GetMin(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinButton_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinButton_GetValue(self, *_args, **_kwargs)
         return val
     def SetRange(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinButton_SetRange,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinButton_SetRange(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinButton_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinButton_SetValue(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxSpinButton instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSpinButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSpinButton(wxSpinButtonPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxSpinButton,_args,_kwargs)
+        self.this = controlsc.new_wxSpinButton(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreSpinButton(*_args,**_kwargs):
-    val = wxSpinButtonPtr(apply(controlsc.new_wxPreSpinButton,_args,_kwargs))
+    val = wxSpinButtonPtr(controlsc.new_wxPreSpinButton(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -805,30 +930,32 @@ class wxStaticBitmapPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticBitmap_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticBitmap_Create(self, *_args, **_kwargs)
         return val
     def GetBitmap(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
+        val = controlsc.wxStaticBitmap_GetBitmap(self, *_args, **_kwargs)
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def SetBitmap(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticBitmap_SetBitmap(self, *_args, **_kwargs)
         return val
     def SetIcon(self, *_args, **_kwargs):
-        val = apply(controlsc.wxStaticBitmap_SetIcon,(self,) + _args, _kwargs)
+        val = controlsc.wxStaticBitmap_SetIcon(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxStaticBitmap instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxStaticBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxStaticBitmap(wxStaticBitmapPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs)
+        self.this = controlsc.new_wxStaticBitmap(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreStaticBitmap(*_args,**_kwargs):
-    val = wxStaticBitmapPtr(apply(controlsc.new_wxPreStaticBitmap,_args,_kwargs))
+    val = wxStaticBitmapPtr(controlsc.new_wxPreStaticBitmap(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -837,52 +964,55 @@ class wxRadioBoxPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_Create(self, *_args, **_kwargs)
         return val
     def Enable(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_Enable,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_Enable(self, *_args, **_kwargs)
         return val
     def EnableItem(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_EnableItem,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_EnableItem(self, *_args, **_kwargs)
         return val
     def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_FindString(self, *_args, **_kwargs)
         return val
     def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_GetString(self, *_args, **_kwargs)
         return val
     def SetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_SetString,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_SetString(self, *_args, **_kwargs)
         return val
     def GetColumnCount(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetColumnCount,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_GetColumnCount(self, *_args, **_kwargs)
         return val
     def GetRowCount(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetRowCount,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_GetRowCount(self, *_args, **_kwargs)
+        return val
+    def GetNextItem(self, *_args, **_kwargs):
+        val = controlsc.wxRadioBox_GetNextItem(self, *_args, **_kwargs)
         return val
     def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_GetSelection(self, *_args, **_kwargs)
         return val
     def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_GetStringSelection(self, *_args, **_kwargs)
         return val
     def GetCount(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetCount,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_GetCount(self, *_args, **_kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_SetSelection(self, *_args, **_kwargs)
         return val
     def SetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_SetStringSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_SetStringSelection(self, *_args, **_kwargs)
         return val
     def Show(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_Show,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_Show(self, *_args, **_kwargs)
         return val
     def ShowItem(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_ShowItem,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioBox_ShowItem(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxRadioBox instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxRadioBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     GetItemLabel = GetString
     SetItemLabel = SetString
@@ -890,14 +1020,16 @@ class wxRadioBoxPtr(wxControlPtr):
     Number = GetCount
 class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)
+        self.this = controlsc.new_wxRadioBox(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreRadioBox(*_args,**_kwargs):
-    val = wxRadioBoxPtr(apply(controlsc.new_wxPreRadioBox,_args,_kwargs))
+    val = wxRadioBoxPtr(controlsc.new_wxPreRadioBox(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -906,26 +1038,28 @@ class wxRadioButtonPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioButton_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioButton_Create(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioButton_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioButton_GetValue(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioButton_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxRadioButton_SetValue(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxRadioButton instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxRadioButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxRadioButton(wxRadioButtonPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs)
+        self.this = controlsc.new_wxRadioButton(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreRadioButton(*_args,**_kwargs):
-    val = wxRadioButtonPtr(apply(controlsc.new_wxPreRadioButton,_args,_kwargs))
+    val = wxRadioButtonPtr(controlsc.new_wxPreRadioButton(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -934,77 +1068,79 @@ class wxSliderPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_Create(self, *_args, **_kwargs)
         return val
     def ClearSel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_ClearSel,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_ClearSel(self, *_args, **_kwargs)
         return val
     def ClearTicks(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_ClearTicks,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_ClearTicks(self, *_args, **_kwargs)
         return val
     def GetLineSize(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetLineSize,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetLineSize(self, *_args, **_kwargs)
         return val
     def GetMax(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetMax,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetMax(self, *_args, **_kwargs)
         return val
     def GetMin(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetMin,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetMin(self, *_args, **_kwargs)
         return val
     def GetPageSize(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetPageSize,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetPageSize(self, *_args, **_kwargs)
         return val
     def GetSelEnd(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetSelEnd,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetSelEnd(self, *_args, **_kwargs)
         return val
     def GetSelStart(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetSelStart,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetSelStart(self, *_args, **_kwargs)
         return val
     def GetThumbLength(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetThumbLength,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetThumbLength(self, *_args, **_kwargs)
         return val
     def GetTickFreq(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetTickFreq,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetTickFreq(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_GetValue(self, *_args, **_kwargs)
         return val
     def SetRange(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetRange,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetRange(self, *_args, **_kwargs)
         return val
     def SetTickFreq(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetTickFreq,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetTickFreq(self, *_args, **_kwargs)
         return val
     def SetLineSize(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetLineSize,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetLineSize(self, *_args, **_kwargs)
         return val
     def SetPageSize(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetPageSize,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetPageSize(self, *_args, **_kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetSelection,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetSelection(self, *_args, **_kwargs)
         return val
     def SetThumbLength(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetThumbLength,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetThumbLength(self, *_args, **_kwargs)
         return val
     def SetTick(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetTick,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetTick(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSlider_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxSlider_SetValue(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxSlider instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSlider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSlider(wxSliderPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxSlider,_args,_kwargs)
+        self.this = controlsc.new_wxSlider(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreSlider(*_args,**_kwargs):
-    val = wxSliderPtr(apply(controlsc.new_wxPreSlider,_args,_kwargs))
+    val = wxSliderPtr(controlsc.new_wxPreSlider(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -1013,35 +1149,40 @@ class wxSpinCtrlPtr(wxSpinButtonPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinCtrl_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinCtrl_Create(self, *_args, **_kwargs)
         return val
     def GetMax(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinCtrl_GetMax,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinCtrl_GetMax(self, *_args, **_kwargs)
         return val
     def GetMin(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinCtrl_GetMin,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinCtrl_GetMin(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinCtrl_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinCtrl_GetValue(self, *_args, **_kwargs)
         return val
     def SetRange(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinCtrl_SetRange,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinCtrl_SetRange(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxSpinCtrl_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxSpinCtrl_SetValue(self, *_args, **_kwargs)
+        return val
+    def SetSelection(self, *_args, **_kwargs):
+        val = controlsc.wxSpinCtrl_SetSelection(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxSpinCtrl instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSpinCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxSpinCtrl(wxSpinCtrlPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxSpinCtrl,_args,_kwargs)
+        self.this = controlsc.new_wxSpinCtrl(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreSpinCtrl(*_args,**_kwargs):
-    val = wxSpinCtrlPtr(apply(controlsc.new_wxPreSpinCtrl,_args,_kwargs))
+    val = wxSpinCtrlPtr(controlsc.new_wxPreSpinCtrl(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -1050,29 +1191,31 @@ class wxToggleButtonPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
-        val = apply(controlsc.wxToggleButton_Create,(self,) + _args, _kwargs)
+        val = controlsc.wxToggleButton_Create(self, *_args, **_kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxToggleButton_SetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxToggleButton_SetValue(self, *_args, **_kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxToggleButton_GetValue,(self,) + _args, _kwargs)
+        val = controlsc.wxToggleButton_GetValue(self, *_args, **_kwargs)
         return val
     def SetLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxToggleButton_SetLabel,(self,) + _args, _kwargs)
+        val = controlsc.wxToggleButton_SetLabel(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxToggleButton instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxToggleButton instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxToggleButton(wxToggleButtonPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(controlsc.new_wxToggleButton,_args,_kwargs)
+        self.this = controlsc.new_wxToggleButton(*_args,**_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
 def wxPreToggleButton(*_args,**_kwargs):
-    val = wxToggleButtonPtr(apply(controlsc.new_wxPreToggleButton,_args,_kwargs))
+    val = wxToggleButtonPtr(controlsc.new_wxPreToggleButton(*_args,**_kwargs))
     val.thisown = 1
+    val._setOORInfo(val)
     return val
 
 
@@ -1081,14 +1224,55 @@ def wxPreToggleButton(*_args,**_kwargs):
 #-------------- FUNCTION WRAPPERS ------------------
 
 def wxButton_GetDefaultSize(*_args, **_kwargs):
-    val = apply(controlsc.wxButton_GetDefaultSize,_args,_kwargs)
+    val = controlsc.wxButton_GetDefaultSize(*_args,**_kwargs)
     if val: val = wxSizePtr(val); val.thisown = 1
     return val
 
+def wxTextAttr_Combine(*_args, **_kwargs):
+    val = controlsc.wxTextAttr_Combine(*_args,**_kwargs)
+    if val: val = wxTextAttrPtr(val); val.thisown = 1
+    return val
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 cvar = controlsc.cvar
 wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator)
+wxTE_NO_VSCROLL = controlsc.wxTE_NO_VSCROLL
+wxTE_AUTO_SCROLL = controlsc.wxTE_AUTO_SCROLL
+wxTE_READONLY = controlsc.wxTE_READONLY
+wxTE_MULTILINE = controlsc.wxTE_MULTILINE
+wxTE_PROCESS_TAB = controlsc.wxTE_PROCESS_TAB
+wxTE_LEFT = controlsc.wxTE_LEFT
+wxTE_CENTER = controlsc.wxTE_CENTER
+wxTE_RIGHT = controlsc.wxTE_RIGHT
+wxTE_CENTRE = controlsc.wxTE_CENTRE
+wxTE_RICH = controlsc.wxTE_RICH
+wxTE_PROCESS_ENTER = controlsc.wxTE_PROCESS_ENTER
+wxTE_PASSWORD = controlsc.wxTE_PASSWORD
+wxTE_AUTO_URL = controlsc.wxTE_AUTO_URL
+wxTE_NOHIDESEL = controlsc.wxTE_NOHIDESEL
+wxTE_DONTWRAP = controlsc.wxTE_DONTWRAP
+wxTE_LINEWRAP = controlsc.wxTE_LINEWRAP
+wxTE_WORDWRAP = controlsc.wxTE_WORDWRAP
+wxTE_RICH2 = controlsc.wxTE_RICH2
+wxTEXT_ATTR_TEXT_COLOUR = controlsc.wxTEXT_ATTR_TEXT_COLOUR
+wxTEXT_ATTR_BACKGROUND_COLOUR = controlsc.wxTEXT_ATTR_BACKGROUND_COLOUR
+wxTEXT_ATTR_FONT_FACE = controlsc.wxTEXT_ATTR_FONT_FACE
+wxTEXT_ATTR_FONT_SIZE = controlsc.wxTEXT_ATTR_FONT_SIZE
+wxTEXT_ATTR_FONT_WEIGHT = controlsc.wxTEXT_ATTR_FONT_WEIGHT
+wxTEXT_ATTR_FONT_ITALIC = controlsc.wxTEXT_ATTR_FONT_ITALIC
+wxTEXT_ATTR_FONT_UNDERLINE = controlsc.wxTEXT_ATTR_FONT_UNDERLINE
+wxTEXT_ATTR_FONT = controlsc.wxTEXT_ATTR_FONT
+wxTEXT_ATTR_ALIGNMENT = controlsc.wxTEXT_ATTR_ALIGNMENT
+wxTEXT_ATTR_LEFT_INDENT = controlsc.wxTEXT_ATTR_LEFT_INDENT
+wxTEXT_ATTR_RIGHT_INDENT = controlsc.wxTEXT_ATTR_RIGHT_INDENT
+wxTEXT_ATTR_TABS = controlsc.wxTEXT_ATTR_TABS
+wxTEXT_ALIGNMENT_DEFAULT = controlsc.wxTEXT_ALIGNMENT_DEFAULT
+wxTEXT_ALIGNMENT_LEFT = controlsc.wxTEXT_ALIGNMENT_LEFT
+wxTEXT_ALIGNMENT_CENTRE = controlsc.wxTEXT_ALIGNMENT_CENTRE
+wxTEXT_ALIGNMENT_CENTER = controlsc.wxTEXT_ALIGNMENT_CENTER
+wxTEXT_ALIGNMENT_RIGHT = controlsc.wxTEXT_ALIGNMENT_RIGHT
+wxTEXT_ALIGNMENT_JUSTIFIED = controlsc.wxTEXT_ALIGNMENT_JUSTIFIED
 wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = controlsc.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED