X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d56cebe7a497773d8753ea2ab874c4445bac18dc..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/wxPython/src/msw/controls.py

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index 79534558f0..3e01f54cbf 100644
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -15,6 +15,9 @@ class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_Create,(self,) + _args, _kwargs)
+        return val
     def Command(self, *_args, **_kwargs):
         val = apply(controlsc.wxControl_Command,(self,) + _args, _kwargs)
         return val
@@ -30,7 +33,58 @@ class wxControl(wxControlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxControl,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
+
+
+
+def wxPreControl(*_args,**_kwargs):
+    val = wxControlPtr(apply(controlsc.new_wxPreControl,_args,_kwargs))
+    val.thisown = 1
+    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 __repr__(self):
+        return "<C wxControlWithItems instance at %s>" % (self.this,)
+    Number = GetCount
+class wxControlWithItems(wxControlWithItemsPtr):
+    def __init__(self,this):
+        self.this = this
 
 
 
@@ -39,6 +93,9 @@ class wxButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_Create,(self,) + _args, _kwargs)
+        return val
     def SetDefault(self, *_args, **_kwargs):
         val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs)
         return val
@@ -48,21 +105,34 @@ class wxButtonPtr(wxControlPtr):
     def SetForegroundColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs)
         return val
+    def SetImageLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetImageLabel,(self,) + _args, _kwargs)
+        return val
+    def SetImageMargins(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetImageMargins,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxButton instance at %s>" % (self.this,)
 class wxButton(wxButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxButton,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreButton(*_args,**_kwargs):
+    val = wxButtonPtr(apply(controlsc.new_wxPreButton,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxBitmapButtonPtr(wxButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(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) 
@@ -106,15 +176,22 @@ class wxBitmapButton(wxBitmapButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreBitmapButton(*_args,**_kwargs):
+    val = wxBitmapButtonPtr(apply(controlsc.new_wxPreBitmapButton,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxCheckBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_Create,(self,) + _args, _kwargs)
+        return val
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)
         return val
@@ -127,39 +204,28 @@ class wxCheckBox(wxCheckBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreCheckBox(*_args,**_kwargs):
+    val = wxCheckBoxPtr(apply(controlsc.new_wxPreCheckBox,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
-class wxChoicePtr(wxControlPtr):
+class wxChoicePtr(wxControlWithItemsPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Append,(self,) + _args, _kwargs)
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Create,(self,) + _args, _kwargs)
         return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_Clear,(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 Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Number,(self,) + _args, _kwargs)
-        return val
     def SetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
         return val
@@ -169,26 +235,33 @@ class wxChoicePtr(wxControlPtr):
     def SetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)
         return val
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetString,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxChoice instance at %s>" % (self.this,)
+    
+    Select = SetSelection
+    
 class wxChoice(wxChoicePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxChoice,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreChoice(*_args,**_kwargs):
+    val = wxChoicePtr(apply(controlsc.new_wxPreChoice,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxComboBoxPtr(wxChoicePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    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)
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Create,(self,) + _args, _kwargs)
         return val
     def Copy(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)
@@ -196,33 +269,15 @@ class wxComboBoxPtr(wxChoicePtr):
     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
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Number,(self,) + _args, _kwargs)
-        return val
     def Paste(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)
         return val
@@ -247,21 +302,31 @@ class wxComboBoxPtr(wxChoicePtr):
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)
         return val
+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetEditable,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxComboBox instance at %s>" % (self.this,)
 class wxComboBox(wxComboBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxComboBox,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreComboBox(*_args,**_kwargs):
+    val = wxComboBoxPtr(apply(controlsc.new_wxPreComboBox,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxGaugePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_Create,(self,) + _args, _kwargs)
+        return val
     def GetBezelFace(self, *_args, **_kwargs):
         val = apply(controlsc.wxGauge_GetBezelFace,(self,) + _args, _kwargs)
         return val
@@ -292,15 +357,22 @@ class wxGauge(wxGaugePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxGauge,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreGauge(*_args,**_kwargs):
+    val = wxGaugePtr(apply(controlsc.new_wxPreGauge,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxStaticBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBox_Create,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxStaticBox instance at %s>" % (self.this,)
 class wxStaticBox(wxStaticBoxPtr):
@@ -310,11 +382,19 @@ class wxStaticBox(wxStaticBoxPtr):
 
 
 
+def wxPreStaticBox(*_args,**_kwargs):
+    val = wxStaticBoxPtr(apply(controlsc.new_wxPreStaticBox,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxStaticLinePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticLine_Create,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxStaticLine instance at %s>" % (self.this,)
 class wxStaticLine(wxStaticLinePtr):
@@ -324,11 +404,19 @@ class wxStaticLine(wxStaticLinePtr):
 
 
 
+def wxPreStaticLine(*_args,**_kwargs):
+    val = wxStaticLinePtr(apply(controlsc.new_wxPreStaticLine,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxStaticTextPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticText_Create,(self,) + _args, _kwargs)
+        return val
     def GetLabel(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticText_GetLabel,(self,) + _args, _kwargs)
         return val
@@ -341,47 +429,36 @@ class wxStaticText(wxStaticTextPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticText,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreStaticText(*_args,**_kwargs):
+    val = wxStaticTextPtr(apply(controlsc.new_wxPreStaticText,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
-class wxListBoxPtr(wxControlPtr):
+class wxListBoxPtr(wxControlWithItemsPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Append,(self,) + _args, _kwargs)
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Create,(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 Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Number,(self,) + _args, _kwargs)
+    def IsSelected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs)
         return val
     def Selected(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)
@@ -410,15 +487,22 @@ class wxListBox(wxListBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreListBox(*_args,**_kwargs):
+    val = wxListBoxPtr(apply(controlsc.new_wxPreListBox,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxCheckListBoxPtr(wxListBoxPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_Create,(self,) + _args, _kwargs)
+        return val
     def IsChecked(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckListBox_IsChecked,(self,) + _args, _kwargs)
         return val
@@ -437,10 +521,14 @@ class wxCheckListBox(wxCheckListBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreCheckListBox(*_args,**_kwargs):
+    val = wxCheckListBoxPtr(apply(controlsc.new_wxPreCheckListBox,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxTextAttrPtr :
     def __init__(self,this):
@@ -493,6 +581,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def __init__(self,this):
         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
@@ -608,6 +699,9 @@ class wxTextCtrlPtr(wxControlPtr):
         val = apply(controlsc.wxTextCtrl_GetDefaultStyle,(self,) + _args, _kwargs)
         if val: val = wxTextAttrPtr(val) 
         return val
+    def SetMaxLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetMaxLength,(self,) + _args, _kwargs)
+        return val
     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
         return val
@@ -617,15 +711,22 @@ class wxTextCtrl(wxTextCtrlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreTextCtrl(*_args,**_kwargs):
+    val = wxTextCtrlPtr(apply(controlsc.new_wxPreTextCtrl,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxScrollBarPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_Create,(self,) + _args, _kwargs)
+        return val
     def GetRange(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_GetRange,(self,) + _args, _kwargs)
         return val
@@ -653,15 +754,22 @@ class wxScrollBar(wxScrollBarPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreScrollBar(*_args,**_kwargs):
+    val = wxScrollBarPtr(apply(controlsc.new_wxPreScrollBar,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxSpinButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_Create,(self,) + _args, _kwargs)
+        return val
     def GetMax(self, *_args, **_kwargs):
         val = apply(controlsc.wxSpinButton_GetMax,(self,) + _args, _kwargs)
         return val
@@ -686,11 +794,19 @@ class wxSpinButton(wxSpinButtonPtr):
 
 
 
+def wxPreSpinButton(*_args,**_kwargs):
+    val = wxSpinButtonPtr(apply(controlsc.new_wxPreSpinButton,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxStaticBitmapPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(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) 
@@ -707,15 +823,22 @@ class wxStaticBitmap(wxStaticBitmapPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreStaticBitmap(*_args,**_kwargs):
+    val = wxStaticBitmapPtr(apply(controlsc.new_wxPreStaticBitmap,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Create,(self,) + _args, _kwargs)
+        return val
     def Enable(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_Enable,(self,) + _args, _kwargs)
         return val
@@ -725,23 +848,26 @@ class wxRadioBoxPtr(wxControlPtr):
     def FindString(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)
         return val
-    def GetItemLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetItemLabel,(self,) + _args, _kwargs)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
+        return val
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetString,(self,) + _args, _kwargs)
+        return val
+    def GetColumnCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetColumnCount,(self,) + _args, _kwargs)
+        return val
+    def GetRowCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetRowCount,(self,) + _args, _kwargs)
         return val
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
         return val
-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
-        return val
     def GetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)
         return val
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_Number,(self,) + _args, _kwargs)
-        return val
-    def SetItemLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_SetItemLabel,(self,) + _args, _kwargs)
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetCount,(self,) + _args, _kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)
@@ -757,19 +883,31 @@ class wxRadioBoxPtr(wxControlPtr):
         return val
     def __repr__(self):
         return "<C wxRadioBox instance at %s>" % (self.this,)
+    
+    GetItemLabel = GetString
+    SetItemLabel = SetString
+    
+    Number = GetCount
 class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreRadioBox(*_args,**_kwargs):
+    val = wxRadioBoxPtr(apply(controlsc.new_wxPreRadioBox,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxRadioButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioButton_Create,(self,) + _args, _kwargs)
+        return val
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioButton_GetValue,(self,) + _args, _kwargs)
         return val
@@ -782,15 +920,22 @@ class wxRadioButton(wxRadioButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreRadioButton(*_args,**_kwargs):
+    val = wxRadioButtonPtr(apply(controlsc.new_wxPreRadioButton,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxSliderPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_Create,(self,) + _args, _kwargs)
+        return val
     def ClearSel(self, *_args, **_kwargs):
         val = apply(controlsc.wxSlider_ClearSel,(self,) + _args, _kwargs)
         return val
@@ -854,15 +999,22 @@ class wxSlider(wxSliderPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSlider,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
 
 
 
+def wxPreSlider(*_args,**_kwargs):
+    val = wxSliderPtr(apply(controlsc.new_wxPreSlider,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxSpinCtrlPtr(wxSpinButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinCtrl_Create,(self,) + _args, _kwargs)
+        return val
     def GetMax(self, *_args, **_kwargs):
         val = apply(controlsc.wxSpinCtrl_GetMax,(self,) + _args, _kwargs)
         return val
@@ -887,11 +1039,19 @@ class wxSpinCtrl(wxSpinCtrlPtr):
 
 
 
+def wxPreSpinCtrl(*_args,**_kwargs):
+    val = wxSpinCtrlPtr(apply(controlsc.new_wxPreSpinCtrl,_args,_kwargs))
+    val.thisown = 1
+    return val
+
 
 class wxToggleButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_Create,(self,) + _args, _kwargs)
+        return val
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxToggleButton_SetValue,(self,) + _args, _kwargs)
         return val
@@ -910,6 +1070,11 @@ class wxToggleButton(wxToggleButtonPtr):
 
 
 
+def wxPreToggleButton(*_args,**_kwargs):
+    val = wxToggleButtonPtr(apply(controlsc.new_wxPreToggleButton,_args,_kwargs))
+    val.thisown = 1
+    return val
+