Some minor updates, fixes, etc.

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

diff --git a/utils/wxPython/src/gtk/controls.py b/utils/wxPython/src/gtk/controls.py
index 7e70aae9faf4e579f6f4151d17be492124ae125b..df2650c7aa4a6c52afe4d35c364a92fdd7004b42 100644 (file)
--- a/utils/wxPython/src/gtk/controls.py
+++ b/utils/wxPython/src/gtk/controls.py
@@ -7,26 +7,30 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from clip_dnd import *
+

 from events import *
 from events import *

-import wxp
+import wx

 class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Command(self,arg0):
-        val = controlsc.wxControl_Command(self.this,arg0.this)
+    def Command(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_Command,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabel(self):
-        val = controlsc.wxControl_GetLabel(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_GetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0):
-        val = controlsc.wxControl_SetLabel(self.this,arg0)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_SetLabel,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxControl instance>"
+        return "<C wxControl instance at %s>" % (self.this,)

 class wxControl(wxControlPtr):
 class wxControl(wxControlPtr):

-    def __init__(self,this):
-        self.this = this
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxControl,_args,_kwargs)
+        self.thisown = 1
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -35,22 +39,22 @@ class wxButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetDefault(self):
-        val = controlsc.wxButton_SetDefault(self.this)
+    def SetDefault(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs)
+        return val
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetBackgroundColour,(self,) + _args, _kwargs)
+        return val
+    def SetForegroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxButton instance>"
+        return "<C wxButton instance at %s>" % (self.this,)

 class wxButton(wxButtonPtr):
 class wxButton(wxButtonPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxButton,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -59,26 +63,41 @@ class wxBitmapButtonPtr(wxButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetBitmapLabel(self):
-        val = controlsc.wxBitmapButton_GetBitmapLabel(self.this)
-        val = wxBitmapPtr(val)
+    def GetBitmapLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapLabel,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def GetBitmapDisabled(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapDisabled,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def GetBitmapFocus(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapFocus,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def GetBitmapSelected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_GetBitmapSelected,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def SetBitmapLabel(self,arg0):
-        val = controlsc.wxBitmapButton_SetBitmapLabel(self.this,arg0.this)
+    def SetBitmapDisabled(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapDisabled,(self,) + _args, _kwargs)
+        return val
+    def SetBitmapFocus(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapFocus,(self,) + _args, _kwargs)
+        return val
+    def SetBitmapSelected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapSelected,(self,) + _args, _kwargs)
+        return val
+    def SetBitmapLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_SetBitmapLabel,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxBitmapButton instance>"
+        return "<C wxBitmapButton instance at %s>" % (self.this,)

 class wxBitmapButton(wxBitmapButtonPtr):
 class wxBitmapButton(wxBitmapButtonPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -87,25 +106,19 @@ class wxCheckBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetValue(self):
-        val = controlsc.wxCheckBox_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxCheckBox_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxCheckBox instance>"
+        return "<C wxCheckBox instance at %s>" % (self.this,)

 class wxCheckBox(wxCheckBoxPtr):
 class wxCheckBox(wxCheckBoxPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -114,136 +127,124 @@ class wxChoicePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0):
-        val = controlsc.wxChoice_Append(self.this,arg0)
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Append,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = controlsc.wxChoice_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxChoice_FindString(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColumns(self):
-        val = controlsc.wxChoice_GetColumns(self.this)
+    def GetColumns(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxChoice_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxChoice_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxChoice_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxChoice_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColumns(self,*args):
-        val = apply(controlsc.wxChoice_SetColumns,(self.this,)+args)
+    def SetColumns(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = controlsc.wxChoice_SetSelection(self.this,arg0)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStringSelection(self,arg0):
-        val = controlsc.wxChoice_SetStringSelection(self.this,arg0)
+    def SetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxChoice instance>"
+        return "<C wxChoice instance at %s>" % (self.this,)

 class wxChoice(wxChoicePtr):
 class wxChoice(wxChoicePtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxChoice,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 
 
 

-class wxComboBoxPtr(wxControlPtr):
+class wxComboBoxPtr(wxChoicePtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0):
-        val = controlsc.wxComboBox_Append(self.this,arg0)
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Append,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = controlsc.wxComboBox_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Clear,(self,) + _args, _kwargs)

         return val
         return val

-    def Copy(self):
-        val = controlsc.wxComboBox_Copy(self.this)
+    def Copy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)

         return val
         return val

-    def Cut(self):
-        val = controlsc.wxComboBox_Cut(self.this)
+    def Cut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs)

         return val
         return val

-    def Delete(self,arg0):
-        val = controlsc.wxComboBox_Delete(self.this,arg0)
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Delete,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxComboBox_FindString(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetInsertionPoint(self):
-        val = controlsc.wxComboBox_GetInsertionPoint(self.this)
+    def GetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLastPosition(self):
-        val = controlsc.wxComboBox_GetLastPosition(self.this)
+    def GetLastPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxComboBox_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxComboBox_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxComboBox_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxComboBox_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxComboBox_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def Paste(self):
-        val = controlsc.wxComboBox_Paste(self.this)
+    def Paste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)

         return val
         return val

-    def Replace(self,arg0,arg1,arg2):
-        val = controlsc.wxComboBox_Replace(self.this,arg0,arg1,arg2)
+    def Replace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Replace,(self,) + _args, _kwargs)

         return val
         return val

-    def Remove(self,arg0,arg1):
-        val = controlsc.wxComboBox_Remove(self.this,arg0,arg1)
+    def Remove(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Remove,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPoint(self,arg0):
-        val = controlsc.wxComboBox_SetInsertionPoint(self.this,arg0)
+    def SetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPointEnd(self):
-        val = controlsc.wxComboBox_SetInsertionPointEnd(self.this)
+    def SetInsertionPointEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetInsertionPointEnd,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0,*args):
-        val = apply(controlsc.wxComboBox_SetSelection,(self.this,arg0,)+args)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMark(self,arg0,arg1):
-        val = controlsc.wxComboBox_SetMark(self.this,arg0,arg1)
+    def SetMark(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetMark,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxComboBox_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxComboBox instance>"
+        return "<C wxComboBox instance at %s>" % (self.this,)

 class wxComboBox(wxComboBoxPtr):
 class wxComboBox(wxComboBoxPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxComboBox,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -252,43 +253,37 @@ class wxGaugePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetBezelFace(self):
-        val = controlsc.wxGauge_GetBezelFace(self.this)
+    def GetBezelFace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetBezelFace,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRange(self):
-        val = controlsc.wxGauge_GetRange(self.this)
+    def GetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def GetShadowWidth(self):
-        val = controlsc.wxGauge_GetShadowWidth(self.this)
+    def GetShadowWidth(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetShadowWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxGauge_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBezelFace(self,arg0):
-        val = controlsc.wxGauge_SetBezelFace(self.this,arg0)
+    def SetBezelFace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetBezelFace,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRange(self,arg0):
-        val = controlsc.wxGauge_SetRange(self.this,arg0)
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def SetShadowWidth(self,arg0):
-        val = controlsc.wxGauge_SetShadowWidth(self.this,arg0)
+    def SetShadowWidth(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetShadowWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxGauge_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxGauge instance>"
+        return "<C wxGauge instance at %s>" % (self.this,)

 class wxGauge(wxGaugePtr):
 class wxGauge(wxGaugePtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxGauge,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -298,16 +293,24 @@ class wxStaticBoxPtr(wxControlPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

-        return "<C wxStaticBox instance>"
+        return "<C wxStaticBox instance at %s>" % (self.this,)

 class wxStaticBox(wxStaticBoxPtr):
 class wxStaticBox(wxStaticBoxPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBox,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticBox,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxStaticLinePtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxStaticLine instance at %s>" % (self.this,)
+class wxStaticLine(wxStaticLinePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticLine,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -317,25 +320,19 @@ class wxStaticTextPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetLabel(self):
-        val = controlsc.wxStaticText_GetLabel(self.this)
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticText_GetLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0):
-        val = controlsc.wxStaticText_SetLabel(self.this,arg0)
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticText_SetLabel,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxStaticText instance>"
+        return "<C wxStaticText instance at %s>" % (self.this,)

 class wxStaticText(wxStaticTextPtr):
 class wxStaticText(wxStaticTextPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticText,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -344,67 +341,94 @@ class wxListBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self,arg0):
-        val = controlsc.wxListBox_Append(self.this,arg0)
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Append,(self,) + _args, _kwargs)
+        return val
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs)
+        return val
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Delete,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = controlsc.wxListBox_Clear(self.this)
+    def Deselect(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs)

         return val
         return val

-    def Delete(self,arg0):
-        val = controlsc.wxListBox_Delete(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def Deselect(self,arg0):
-        val = controlsc.wxListBox_Deselect(self.this,arg0)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxListBox_FindString(self.this,arg0)
+    def GetSelections(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxListBox_GetSelection(self.this)
+    def InsertItems(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxListBox_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxListBox_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxListBox_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def Selected(self,arg0):
-        val = controlsc.wxListBox_Selected(self.this,arg0)
+    def Selected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)

         return val
         return val

-    def Set(self,arg0,*args):
-        val = apply(controlsc.wxListBox_Set,(self.this,arg0,)+args)
+    def Set(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Set,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFirstItem(self,arg0):
-        val = controlsc.wxListBox_SetFirstItem(self.this,arg0)
+    def SetFirstItem(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetFirstItem,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFirstItemStr(self,arg0):
-        val = controlsc.wxListBox_SetFirstItemStr(self.this,arg0)
+    def SetFirstItemStr(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetFirstItemStr,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0,*args):
-        val = apply(controlsc.wxListBox_SetSelection,(self.this,arg0,)+args)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetString(self,arg0,arg1):
-        val = controlsc.wxListBox_SetString(self.this,arg0,arg1)
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetString,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStringSelection(self,arg0,*args):
-        val = apply(controlsc.wxListBox_SetStringSelection,(self.this,arg0,)+args)
+    def SetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_SetStringSelection,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxListBox instance>"
+        return "<C wxListBox instance at %s>" % (self.this,)

 class wxListBox(wxListBoxPtr):
 class wxListBox(wxListBoxPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxListBox,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
+
+
+
+
+class wxCheckListBoxPtr(wxListBoxPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_IsChecked,(self,) + _args, _kwargs)
+        return val
+    def Check(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_Check,(self,) + _args, _kwargs)
+        return val
+    def InsertItems(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_InsertItems,(self,) + _args, _kwargs)
+        return val
+    def GetItemHeight(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_GetItemHeight,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxCheckListBox instance at %s>" % (self.this,)
+class wxCheckListBox(wxCheckListBoxPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs)
+        self.thisown = 1
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -413,79 +437,121 @@ class wxTextCtrlPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Clear(self):
-        val = controlsc.wxTextCtrl_Clear(self.this)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs)
+        return val
+    def Copy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Copy,(self,) + _args, _kwargs)
+        return val
+    def Cut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Cut,(self,) + _args, _kwargs)
+        return val
+    def DiscardEdits(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_DiscardEdits,(self,) + _args, _kwargs)
+        return val
+    def GetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetInsertionPoint,(self,) + _args, _kwargs)
+        return val
+    def GetLastPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetLastPosition,(self,) + _args, _kwargs)
+        return val
+    def GetLineLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)
+        return val
+    def GetLineText(self, *_args, **_kwargs):
+        val = apply(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)
+        return val
+    def IsModified(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsModified,(self,) + _args, _kwargs)
+        return val
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_LoadFile,(self,) + _args, _kwargs)
+        return val
+    def Paste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Paste,(self,) + _args, _kwargs)
+        return val
+    def PositionToXY(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_PositionToXY,(self,) + _args, _kwargs)
+        return val
+    def Remove(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Remove,(self,) + _args, _kwargs)
+        return val
+    def Replace(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Replace,(self,) + _args, _kwargs)
+        return val
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs)

         return val
         return val

-    def Copy(self):
-        val = controlsc.wxTextCtrl_Copy(self.this)
+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)

         return val
         return val

-    def Cut(self):
-        val = controlsc.wxTextCtrl_Cut(self.this)
+    def SetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def DiscardEdits(self):
-        val = controlsc.wxTextCtrl_DiscardEdits(self.this)
+    def SetInsertionPointEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs)

         return val
         return val

-    def GetInsertionPoint(self):
-        val = controlsc.wxTextCtrl_GetInsertionPoint(self.this)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLastPosition(self):
-        val = controlsc.wxTextCtrl_GetLastPosition(self.this)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxTextCtrl_GetValue(self.this)
+    def ShowPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def IsModified(self):
-        val = controlsc.wxTextCtrl_IsModified(self.this)
+    def WriteText(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_WriteText,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFile(self,arg0):
-        val = controlsc.wxTextCtrl_LoadFile(self.this,arg0)
+    def AppendText(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)

         return val
         return val

-    def Paste(self):
-        val = controlsc.wxTextCtrl_Paste(self.this)
+    def XYToPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_XYToPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def Remove(self,arg0,arg1):
-        val = controlsc.wxTextCtrl_Remove(self.this,arg0,arg1)
+    def CanCopy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanCopy,(self,) + _args, _kwargs)

         return val
         return val

-    def Replace(self,arg0,arg1,arg2):
-        val = controlsc.wxTextCtrl_Replace(self.this,arg0,arg1,arg2)
+    def CanCut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanCut,(self,) + _args, _kwargs)

         return val
         return val

-    def SaveFile(self,arg0):
-        val = controlsc.wxTextCtrl_SaveFile(self.this,arg0)
+    def CanPaste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanPaste,(self,) + _args, _kwargs)

         return val
         return val

-    def SetEditable(self,arg0):
-        val = controlsc.wxTextCtrl_SetEditable(self.this,arg0)
+    def CanRedo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanRedo,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPoint(self,arg0):
-        val = controlsc.wxTextCtrl_SetInsertionPoint(self.this,arg0)
+    def CanUndo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanUndo,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPointEnd(self):
-        val = controlsc.wxTextCtrl_SetInsertionPointEnd(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0,arg1):
-        val = controlsc.wxTextCtrl_SetSelection(self.this,arg0,arg1)
+    def IsEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsEditable,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxTextCtrl_SetValue(self.this,arg0)
+    def Undo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Undo,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowPosition(self,arg0):
-        val = controlsc.wxTextCtrl_ShowPosition(self.this,arg0)
+    def Redo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Redo,(self,) + _args, _kwargs)

         return val
         return val

-    def WriteText(self,arg0):
-        val = controlsc.wxTextCtrl_WriteText(self.this,arg0)
+    def write(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTextCtrl instance>"
+        return "<C wxTextCtrl instance at %s>" % (self.this,)

 class wxTextCtrl(wxTextCtrlPtr):
 class wxTextCtrl(wxTextCtrlPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -494,37 +560,60 @@ class wxScrollBarPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetRange(self):
-        val = controlsc.wxScrollBar_GetRange(self.this)
+    def GetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPageSize(self):
-        val = controlsc.wxScrollBar_GetPageSize(self.this)
+    def GetPageSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetPageSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPosition(self):
-        val = controlsc.wxScrollBar_GetPosition(self.this)
+    def GetThumbPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetThumbPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def GetThumbSize(self):
-        val = controlsc.wxScrollBar_GetThumbSize(self.this)
+    def GetThumbSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_GetThumbSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPosition(self,arg0):
-        val = controlsc.wxScrollBar_SetPosition(self.this,arg0)
+    def SetThumbPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(controlsc.wxScrollBar_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def SetScrollbar(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_SetScrollbar,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxScrollBar instance>"
+        return "<C wxScrollBar instance at %s>" % (self.this,)

 class wxScrollBar(wxScrollBarPtr):
 class wxScrollBar(wxScrollBarPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs)
+        self.thisown = 1
+        wx._StdWindowCallbacks(self)
+
+
+
+
+class wxSpinButtonPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetMax(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_GetMax,(self,) + _args, _kwargs)
+        return val
+    def GetMin(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_GetMin,(self,) + _args, _kwargs)
+        return val
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_GetValue,(self,) + _args, _kwargs)
+        return val
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_SetRange,(self,) + _args, _kwargs)
+        return val
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_SetValue,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxSpinButton instance at %s>" % (self.this,)
+class wxSpinButton(wxSpinButtonPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxSpinButton,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -533,26 +622,23 @@ class wxStaticBitmapPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetBitmap(self):
-        val = controlsc.wxStaticBitmap_GetBitmap(self.this)
-        val = wxBitmapPtr(val)
+    def GetBitmap(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 
+        return val
+    def SetBitmap(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBitmap(self,arg0):
-        val = controlsc.wxStaticBitmap_SetBitmap(self.this,arg0.this)
+    def SetIcon(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBitmap_SetIcon,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxStaticBitmap instance>"
+        return "<C wxStaticBitmap instance at %s>" % (self.this,)

 class wxStaticBitmap(wxStaticBitmapPtr):
 class wxStaticBitmap(wxStaticBitmapPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -561,61 +647,52 @@ class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def EnableBox(self,arg0):
-        val = controlsc.wxRadioBox_EnableBox(self.this,arg0)
+    def Enable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Enable,(self,) + _args, _kwargs)

         return val
         return val

-    def Enable(self,arg0,arg1):
-        val = controlsc.wxRadioBox_Enable(self.this,arg0,arg1)
+    def EnableItem(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_EnableItem,(self,) + _args, _kwargs)

         return val
         return val

-    def FindString(self,arg0):
-        val = controlsc.wxRadioBox_FindString(self.this,arg0)
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLabel(self,arg0):
-        val = controlsc.wxRadioBox_GetLabel(self.this,arg0)
+    def GetItemLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetItemLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controlsc.wxRadioBox_GetSelection(self.this)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def GetString(self,arg0):
-        val = controlsc.wxRadioBox_GetString(self.this,arg0)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStringSelection(self):
-        val = controlsc.wxRadioBox_GetStringSelection(self.this)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Number(self):
-        val = controlsc.wxRadioBox_Number(self.this)
+    def Number(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Number,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBoxLabel(self,arg0):
-        val = controlsc.wxRadioBox_SetBoxLabel(self.this,arg0)
+    def SetItemLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetItemLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLabel(self,arg0,arg1):
-        val = controlsc.wxRadioBox_SetLabel(self.this,arg0,arg1)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = controlsc.wxRadioBox_SetSelection(self.this,arg0)
+    def SetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStringSelection(self,arg0):
-        val = controlsc.wxRadioBox_SetStringSelection(self.this,arg0)
+    def Show(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Show,(self,) + _args, _kwargs)

         return val
         return val

-    def Show(self,arg0):
-        val = controlsc.wxRadioBox_Show(self.this,arg0)
-        return val
-    def ShowItem(self,arg0,arg1):
-        val = controlsc.wxRadioBox_ShowItem(self.this,arg0,arg1)
+    def ShowItem(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_ShowItem,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxRadioBox instance>"
+        return "<C wxRadioBox instance at %s>" % (self.this,)

 class wxRadioBox(wxRadioBoxPtr):
 class wxRadioBox(wxRadioBoxPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -624,25 +701,19 @@ class wxRadioButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetValue(self):
-        val = controlsc.wxRadioButton_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioButton_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxRadioButton_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioButton_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxRadioButton instance>"
+        return "<C wxRadioButton instance at %s>" % (self.this,)

 class wxRadioButton(wxRadioButtonPtr):
 class wxRadioButton(wxRadioButtonPtr):

-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -651,76 +722,70 @@ class wxSliderPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def ClearSel(self):
-        val = controlsc.wxSlider_ClearSel(self.this)
+    def ClearSel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_ClearSel,(self,) + _args, _kwargs)

         return val
         return val

-    def ClearTicks(self):
-        val = controlsc.wxSlider_ClearTicks(self.this)
+    def ClearTicks(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_ClearTicks,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLineSize(self):
-        val = controlsc.wxSlider_GetLineSize(self.this)
+    def GetLineSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetLineSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMax(self):
-        val = controlsc.wxSlider_GetMax(self.this)
+    def GetMax(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetMax,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMin(self):
-        val = controlsc.wxSlider_GetMin(self.this)
+    def GetMin(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetMin,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPageSize(self):
-        val = controlsc.wxSlider_GetPageSize(self.this)
+    def GetPageSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetPageSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelEnd(self):
-        val = controlsc.wxSlider_GetSelEnd(self.this)
+    def GetSelEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetSelEnd,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelStart(self):
-        val = controlsc.wxSlider_GetSelStart(self.this)
+    def GetSelStart(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetSelStart,(self,) + _args, _kwargs)

         return val
         return val

-    def GetThumbLength(self):
-        val = controlsc.wxSlider_GetThumbLength(self.this)
+    def GetThumbLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetThumbLength,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTickFreq(self):
-        val = controlsc.wxSlider_GetTickFreq(self.this)
+    def GetTickFreq(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetTickFreq,(self,) + _args, _kwargs)

         return val
         return val

-    def GetValue(self):
-        val = controlsc.wxSlider_GetValue(self.this)
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_GetValue,(self,) + _args, _kwargs)

         return val
         return val

-    def SetRange(self,arg0,arg1):
-        val = controlsc.wxSlider_SetRange(self.this,arg0,arg1)
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetRange,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTickFreq(self,arg0,arg1):
-        val = controlsc.wxSlider_SetTickFreq(self.this,arg0,arg1)
+    def SetTickFreq(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetTickFreq,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLineSize(self,arg0):
-        val = controlsc.wxSlider_SetLineSize(self.this,arg0)
+    def SetLineSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetLineSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPageSize(self,arg0):
-        val = controlsc.wxSlider_SetPageSize(self.this,arg0)
+    def SetPageSize(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetPageSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self,arg0,arg1):
-        val = controlsc.wxSlider_SetSelection(self.this,arg0,arg1)
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def SetThumbLength(self,arg0):
-        val = controlsc.wxSlider_SetThumbLength(self.this,arg0)
+    def SetThumbLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetThumbLength,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTick(self,arg0):
-        val = controlsc.wxSlider_SetTick(self.this,arg0)
+    def SetTick(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetTick,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self,arg0):
-        val = controlsc.wxSlider_SetValue(self.this,arg0)
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_SetValue,(self,) + _args, _kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxSlider instance>"
+        return "<C wxSlider instance at %s>" % (self.this,)

 class wxSlider(wxSliderPtr):
 class wxSlider(wxSliderPtr):

-    def __init__(self,arg0,arg1,arg2,arg3,arg4,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxSlider,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -729,7 +794,14 @@ class wxSlider(wxSliderPtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

+def wxButton_GetDefaultSize(*_args, **_kwargs):
+    val = apply(controlsc.wxButton_GetDefaultSize,_args,_kwargs)
+    if val: val = wxSizePtr(val); val.thisown = 1
+    return val
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

+cvar = controlsc.cvar
+wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator)