]> git.saurik.com Git - wxWidgets.git/blobdiff - utils/wxPython/src/gtk/misc.py
fixed interpretation of <font size>: was always relative to current size, now conform...
[wxWidgets.git] / utils / wxPython / src / gtk / misc.py
index d72a369b9d770e1624f018716d63bfa2c39c3cf6..486aec9d0e20f328ab7ecfdcae9b48b5f54a3a5d 100644 (file)
@@ -4,64 +4,64 @@ class wxSizePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
-            miscc.delete_wxSize(self.this)
-    def Set(self,arg0,arg1):
-        val = miscc.wxSize_Set(self.this,arg0,arg1)
+            miscc.delete_wxSize(self)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs)
         return val
-    def GetX(self):
-        val = miscc.wxSize_GetX(self.this)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetX,(self,) + _args, _kwargs)
         return val
-    def GetY(self):
-        val = miscc.wxSize_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetY,(self,) + _args, _kwargs)
         return val
-    def GetWidth(self):
-        val = miscc.wxSize_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetWidth,(self,) + _args, _kwargs)
         return val
-    def GetHeight(self):
-        val = miscc.wxSize_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetHeight,(self,) + _args, _kwargs)
         return val
-    def SetWidth(self,arg0):
-        val = miscc.wxSize_SetWidth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_SetWidth,(self,) + _args, _kwargs)
         return val
-    def SetHeight(self,arg0):
-        val = miscc.wxSize_SetHeight(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_SetHeight,(self,) + _args, _kwargs)
         return val
-    def asTuple(self):
-        val = miscc.wxSize_asTuple(self.this)
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_asTuple,(self,) + _args, _kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "x" :
-            miscc.wxSize_x_set(self.this,value)
+            miscc.wxSize_x_set(self,value)
             return
         if name == "y" :
-            miscc.wxSize_y_set(self.this,value)
+            miscc.wxSize_y_set(self,value)
             return
         if name == "width" :
-            miscc.wxSize_width_set(self.this,value)
+            miscc.wxSize_width_set(self,value)
             return
         if name == "height" :
-            miscc.wxSize_height_set(self.this,value)
+            miscc.wxSize_height_set(self,value)
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
-            return miscc.wxSize_x_get(self.this)
+            return miscc.wxSize_x_get(self)
         if name == "y" : 
-            return miscc.wxSize_y_get(self.this)
+            return miscc.wxSize_y_get(self)
         if name == "width" : 
-            return miscc.wxSize_width_get(self.this)
+            return miscc.wxSize_width_get(self)
         if name == "height" : 
-            return miscc.wxSize_height_get(self.this)
+            return miscc.wxSize_height_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxSize instance>"
+        return "<C wxSize instance at %s>" % (self.this,)
     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxSize(wxSizePtr):
-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxSize,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxSize,_args,_kwargs)
         self.thisown = 1
 
 
@@ -71,28 +71,36 @@ class wxRealPointPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
-            miscc.delete_wxRealPoint(self.this)
+            miscc.delete_wxRealPoint(self)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs)
+        return val
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxRealPoint_asTuple,(self,) + _args, _kwargs)
+        return val
     def __setattr__(self,name,value):
         if name == "x" :
-            miscc.wxRealPoint_x_set(self.this,value)
+            miscc.wxRealPoint_x_set(self,value)
             return
         if name == "y" :
-            miscc.wxRealPoint_y_set(self.this,value)
+            miscc.wxRealPoint_y_set(self,value)
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
-            return miscc.wxRealPoint_x_get(self.this)
+            return miscc.wxRealPoint_x_get(self)
         if name == "y" : 
-            return miscc.wxRealPoint_y_get(self.this)
+            return miscc.wxRealPoint_y_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxRealPoint instance>"
+        return "<C wxRealPoint instance at %s>" % (self.this,)
+    def __str__(self): return str(self.asTuple())
+    def __repr__(self): return str(self.asTuple())
 class wxRealPoint(wxRealPointPtr):
-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxRealPoint,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRealPoint,_args,_kwargs)
         self.thisown = 1
 
 
@@ -102,36 +110,36 @@ class wxPointPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
-            miscc.delete_wxPoint(self.this)
-    def Set(self,arg0,arg1):
-        val = miscc.wxPoint_Set(self.this,arg0,arg1)
+            miscc.delete_wxPoint(self)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs)
         return val
-    def asTuple(self):
-        val = miscc.wxPoint_asTuple(self.this)
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxPoint_asTuple,(self,) + _args, _kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "x" :
-            miscc.wxPoint_x_set(self.this,value)
+            miscc.wxPoint_x_set(self,value)
             return
         if name == "y" :
-            miscc.wxPoint_y_set(self.this,value)
+            miscc.wxPoint_y_set(self,value)
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
-            return miscc.wxPoint_x_get(self.this)
+            return miscc.wxPoint_x_get(self)
         if name == "y" : 
-            return miscc.wxPoint_y_get(self.this)
+            return miscc.wxPoint_y_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxPoint instance>"
+        return "<C wxPoint instance at %s>" % (self.this,)
     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxPoint(wxPointPtr):
-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxPoint,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxPoint,_args,_kwargs)
         self.thisown = 1
 
 
@@ -141,89 +149,99 @@ class wxRectPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
-            miscc.delete_wxRect(self.this)
-    def GetX(self):
-        val = miscc.wxRect_GetX(self.this)
+            miscc.delete_wxRect(self)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs)
+        return val
+    def SetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetX,(self,) + _args, _kwargs)
+        return val
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetY,(self,) + _args, _kwargs)
         return val
-    def SetX(self,arg0):
-        val = miscc.wxRect_SetX(self.this,arg0)
+    def SetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetY,(self,) + _args, _kwargs)
         return val
-    def GetY(self):
-        val = miscc.wxRect_GetY(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetWidth,(self,) + _args, _kwargs)
         return val
-    def SetY(self,arg0):
-        val = miscc.wxRect_SetY(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetWidth,(self,) + _args, _kwargs)
         return val
-    def GetWidth(self):
-        val = miscc.wxRect_GetWidth(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetHeight,(self,) + _args, _kwargs)
         return val
-    def SetWidth(self,arg0):
-        val = miscc.wxRect_SetWidth(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetHeight,(self,) + _args, _kwargs)
         return val
-    def GetHeight(self):
-        val = miscc.wxRect_GetHeight(self.this)
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
-    def SetHeight(self,arg0):
-        val = miscc.wxRect_SetHeight(self.this,arg0)
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
-    def GetPosition(self):
-        val = miscc.wxRect_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetLeft(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetLeft,(self,) + _args, _kwargs)
         return val
-    def GetSize(self):
-        val = miscc.wxRect_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetTop(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetTop,(self,) + _args, _kwargs)
         return val
-    def GetLeft(self):
-        val = miscc.wxRect_GetLeft(self.this)
+    def GetBottom(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetBottom,(self,) + _args, _kwargs)
         return val
-    def GetTop(self):
-        val = miscc.wxRect_GetTop(self.this)
+    def GetRight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs)
         return val
-    def GetBottom(self):
-        val = miscc.wxRect_GetBottom(self.this)
+    def SetLeft(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetLeft,(self,) + _args, _kwargs)
         return val
-    def GetRight(self):
-        val = miscc.wxRect_GetRight(self.this)
+    def SetRight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetRight,(self,) + _args, _kwargs)
         return val
-    def asTuple(self):
-        val = miscc.wxRect_asTuple(self.this)
+    def SetTop(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetTop,(self,) + _args, _kwargs)
+        return val
+    def SetBottom(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetBottom,(self,) + _args, _kwargs)
+        return val
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_asTuple,(self,) + _args, _kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "x" :
-            miscc.wxRect_x_set(self.this,value)
+            miscc.wxRect_x_set(self,value)
             return
         if name == "y" :
-            miscc.wxRect_y_set(self.this,value)
+            miscc.wxRect_y_set(self,value)
             return
         if name == "width" :
-            miscc.wxRect_width_set(self.this,value)
+            miscc.wxRect_width_set(self,value)
             return
         if name == "height" :
-            miscc.wxRect_height_set(self.this,value)
+            miscc.wxRect_height_set(self,value)
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
-            return miscc.wxRect_x_get(self.this)
+            return miscc.wxRect_x_get(self)
         if name == "y" : 
-            return miscc.wxRect_y_get(self.this)
+            return miscc.wxRect_y_get(self)
         if name == "width" : 
-            return miscc.wxRect_width_get(self.this)
+            return miscc.wxRect_width_get(self)
         if name == "height" : 
-            return miscc.wxRect_height_get(self.this)
+            return miscc.wxRect_height_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxRect instance>"
+        return "<C wxRect instance at %s>" % (self.this,)
     def __str__(self): return str(self.asTuple())
     def __repr__(self): return str(self.asTuple())
 class wxRect(wxRectPtr):
-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxRect,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRect,_args,_kwargs)
         self.thisown = 1
 
 
@@ -233,23 +251,26 @@ class wxPyTimerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
-            miscc.delete_wxPyTimer(self.this)
-    def Interval(self):
-        val = miscc.wxPyTimer_Interval(self.this)
+            miscc.delete_wxPyTimer(self)
+    def GetInterval(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_GetInterval,(self,) + _args, _kwargs)
+        return val
+    def IsOneShot(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_IsOneShot,(self,) + _args, _kwargs)
         return val
-    def Start(self,*args):
-        val = apply(miscc.wxPyTimer_Start,(self.this,)+args)
+    def Start(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_Start,(self,) + _args, _kwargs)
         return val
-    def Stop(self):
-        val = miscc.wxPyTimer_Stop(self.this)
+    def Stop(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_Stop,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxPyTimer instance>"
+        return "<C wxPyTimer instance at %s>" % (self.this,)
 class wxPyTimer(wxPyTimerPtr):
-    def __init__(self,arg0) :
-        self.this = miscc.new_wxPyTimer(arg0)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxPyTimer,_args,_kwargs)
         self.thisown = 1
 
 
@@ -259,38 +280,38 @@ class wxIndividualLayoutConstraintPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def Above(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_Above,(self.this,arg0.this,)+args)
+    def Above(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Above,(self,) + _args, _kwargs)
         return val
-    def Absolute(self,arg0):
-        val = miscc.wxIndividualLayoutConstraint_Absolute(self.this,arg0)
+    def Absolute(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Absolute,(self,) + _args, _kwargs)
         return val
-    def AsIs(self):
-        val = miscc.wxIndividualLayoutConstraint_AsIs(self.this)
+    def AsIs(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_AsIs,(self,) + _args, _kwargs)
         return val
-    def Below(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_Below,(self.this,arg0.this,)+args)
+    def Below(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Below,(self,) + _args, _kwargs)
         return val
-    def Unconstrained(self):
-        val = miscc.wxIndividualLayoutConstraint_Unconstrained(self.this)
+    def Unconstrained(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Unconstrained,(self,) + _args, _kwargs)
         return val
-    def LeftOf(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_LeftOf,(self.this,arg0.this,)+args)
+    def LeftOf(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_LeftOf,(self,) + _args, _kwargs)
         return val
-    def PercentOf(self,arg0,arg1,arg2):
-        val = miscc.wxIndividualLayoutConstraint_PercentOf(self.this,arg0.this,arg1,arg2)
+    def PercentOf(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_PercentOf,(self,) + _args, _kwargs)
         return val
-    def RightOf(self,arg0,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_RightOf,(self.this,arg0.this,)+args)
+    def RightOf(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_RightOf,(self,) + _args, _kwargs)
         return val
-    def SameAs(self,arg0,arg1,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_SameAs,(self.this,arg0.this,arg1,)+args)
+    def SameAs(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_SameAs,(self,) + _args, _kwargs)
         return val
-    def Set(self,arg0,arg1,arg2,*args):
-        val = apply(miscc.wxIndividualLayoutConstraint_Set,(self.this,arg0,arg1.this,arg2,)+args)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxIndividualLayoutConstraint_Set,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxIndividualLayoutConstraint instance>"
+        return "<C wxIndividualLayoutConstraint instance at %s>" % (self.this,)
 class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr):
     def __init__(self,this):
         self.this = this
@@ -304,53 +325,53 @@ class wxLayoutConstraintsPtr :
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "bottom" :
-            miscc.wxLayoutConstraints_bottom_set(self.this,value.this)
+            miscc.wxLayoutConstraints_bottom_set(self,value.this)
             return
         if name == "centreX" :
-            miscc.wxLayoutConstraints_centreX_set(self.this,value.this)
+            miscc.wxLayoutConstraints_centreX_set(self,value.this)
             return
         if name == "centreY" :
-            miscc.wxLayoutConstraints_centreY_set(self.this,value.this)
+            miscc.wxLayoutConstraints_centreY_set(self,value.this)
             return
         if name == "height" :
-            miscc.wxLayoutConstraints_height_set(self.this,value.this)
+            miscc.wxLayoutConstraints_height_set(self,value.this)
             return
         if name == "left" :
-            miscc.wxLayoutConstraints_left_set(self.this,value.this)
+            miscc.wxLayoutConstraints_left_set(self,value.this)
             return
         if name == "right" :
-            miscc.wxLayoutConstraints_right_set(self.this,value.this)
+            miscc.wxLayoutConstraints_right_set(self,value.this)
             return
         if name == "top" :
-            miscc.wxLayoutConstraints_top_set(self.this,value.this)
+            miscc.wxLayoutConstraints_top_set(self,value.this)
             return
         if name == "width" :
-            miscc.wxLayoutConstraints_width_set(self.this,value.this)
+            miscc.wxLayoutConstraints_width_set(self,value.this)
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "bottom" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_bottom_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_bottom_get(self))
         if name == "centreX" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreX_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreX_get(self))
         if name == "centreY" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreY_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreY_get(self))
         if name == "height" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_height_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_height_get(self))
         if name == "left" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_left_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_left_get(self))
         if name == "right" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_right_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_right_get(self))
         if name == "top" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_top_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_top_get(self))
         if name == "width" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self))
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxLayoutConstraints instance>"
+        return "<C wxLayoutConstraints instance at %s>" % (self.this,)
 class wxLayoutConstraints(wxLayoutConstraintsPtr):
-    def __init__(self:
-        self.this = miscc.new_wxLayoutConstraints()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxLayoutConstraints,_args,_kwargs)
         self.thisown = 1
 
 
@@ -360,43 +381,72 @@ class wxRegionPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
-            miscc.delete_wxRegion(self.this)
-    def Clear(self):
-        val = miscc.wxRegion_Clear(self.this)
+            miscc.delete_wxRegion(self)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Clear,(self,) + _args, _kwargs)
+        return val
+    def Contains(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Contains,(self,) + _args, _kwargs)
+        return val
+    def ContainsPoint(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsPoint,(self,) + _args, _kwargs)
         return val
-    def Contains(self,arg0,arg1):
-        val = miscc.wxRegion_Contains(self.this,arg0,arg1)
+    def ContainsRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsRect,(self,) + _args, _kwargs)
         return val
-    def ContainsPoint(self,arg0):
-        val = miscc.wxRegion_ContainsPoint(self.this,arg0.this)
+    def ContainsRectDim(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsRectDim,(self,) + _args, _kwargs)
         return val
-    def ContainsRect(self,arg0):
-        val = miscc.wxRegion_ContainsRect(self.this,arg0.this)
+    def GetBox(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_GetBox,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
         return val
-    def GetBox(self):
-        val = miscc.wxRegion_GetBox(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def Intersect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)
         return val
-    def Intersect(self,arg0):
-        val = miscc.wxRegion_Intersect(self.this,arg0.this)
+    def IntersectRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IntersectRect,(self,) + _args, _kwargs)
         return val
-    def Subtract(self,arg0):
-        val = miscc.wxRegion_Subtract(self.this,arg0.this)
+    def IntersectRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IntersectRegion,(self,) + _args, _kwargs)
         return val
-    def Union(self,arg0):
-        val = miscc.wxRegion_Union(self.this,arg0.this)
+    def IsEmpty(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)
         return val
-    def Xor(self,arg0):
-        val = miscc.wxRegion_Xor(self.this,arg0.this)
+    def Union(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Union,(self,) + _args, _kwargs)
+        return val
+    def UnionRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_UnionRect,(self,) + _args, _kwargs)
+        return val
+    def UnionRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_UnionRegion,(self,) + _args, _kwargs)
+        return val
+    def Subtract(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Subtract,(self,) + _args, _kwargs)
+        return val
+    def SubtractRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_SubtractRect,(self,) + _args, _kwargs)
+        return val
+    def SubtractRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_SubtractRegion,(self,) + _args, _kwargs)
+        return val
+    def Xor(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Xor,(self,) + _args, _kwargs)
+        return val
+    def XorRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_XorRect,(self,) + _args, _kwargs)
+        return val
+    def XorRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_XorRegion,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxRegion instance>"
+        return "<C wxRegion instance at %s>" % (self.this,)
 class wxRegion(wxRegionPtr):
-    def __init__(self:
-        self.this = miscc.new_wxRegion()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRegion,_args,_kwargs)
         self.thisown = 1
 
 
@@ -406,46 +456,45 @@ class wxRegionIteratorPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
-            miscc.delete_wxRegionIterator(self.this)
-    def GetX(self):
-        val = miscc.wxRegionIterator_GetX(self.this)
+            miscc.delete_wxRegionIterator(self)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetX,(self,) + _args, _kwargs)
         return val
-    def GetY(self):
-        val = miscc.wxRegionIterator_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetY,(self,) + _args, _kwargs)
         return val
-    def GetW(self):
-        val = miscc.wxRegionIterator_GetW(self.this)
+    def GetW(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetW,(self,) + _args, _kwargs)
         return val
-    def GetWidth(self):
-        val = miscc.wxRegionIterator_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetWidth,(self,) + _args, _kwargs)
         return val
-    def GetH(self):
-        val = miscc.wxRegionIterator_GetH(self.this)
+    def GetH(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetH,(self,) + _args, _kwargs)
         return val
-    def GetHeight(self):
-        val = miscc.wxRegionIterator_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetHeight,(self,) + _args, _kwargs)
         return val
-    def GetRect(self):
-        val = miscc.wxRegionIterator_GetRect(self.this)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
         return val
-    def HaveRects(self):
-        val = miscc.wxRegionIterator_HaveRects(self.this)
+    def HaveRects(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_HaveRects,(self,) + _args, _kwargs)
         return val
-    def Reset(self):
-        val = miscc.wxRegionIterator_Reset(self.this)
+    def Reset(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_Reset,(self,) + _args, _kwargs)
         return val
-    def Next(self):
-        val = miscc.wxRegionIterator_Next(self.this)
+    def Next(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_Next,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxRegionIterator instance>"
+        return "<C wxRegionIterator instance at %s>" % (self.this,)
 class wxRegionIterator(wxRegionIteratorPtr):
-    def __init__(self,arg0) :
-        self.this = miscc.new_wxRegionIterator(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRegionIterator,_args,_kwargs)
         self.thisown = 1
 
 
@@ -455,23 +504,26 @@ class wxAcceleratorEntryPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def Set(self,arg0,arg1,arg2):
-        val = miscc.wxAcceleratorEntry_Set(self.this,arg0,arg1,arg2)
+    def __del__(self,miscc=miscc):
+        if self.thisown == 1 :
+            miscc.delete_wxAcceleratorEntry(self)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs)
         return val
-    def GetFlags(self):
-        val = miscc.wxAcceleratorEntry_GetFlags(self.this)
+    def GetFlags(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_GetFlags,(self,) + _args, _kwargs)
         return val
-    def GetKeyCode(self):
-        val = miscc.wxAcceleratorEntry_GetKeyCode(self.this)
+    def GetKeyCode(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_GetKeyCode,(self,) + _args, _kwargs)
         return val
-    def GetCommand(self):
-        val = miscc.wxAcceleratorEntry_GetCommand(self.this)
+    def GetCommand(self, *_args, **_kwargs):
+        val = apply(miscc.wxAcceleratorEntry_GetCommand,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
-        return "<C wxAcceleratorEntry instance>"
+        return "<C wxAcceleratorEntry instance at %s>" % (self.this,)
 class wxAcceleratorEntry(wxAcceleratorEntryPtr):
-    def __init__(self,*args) :
-        self.this = apply(miscc.new_wxAcceleratorEntry,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxAcceleratorEntry,_args,_kwargs)
         self.thisown = 1
 
 
@@ -481,11 +533,31 @@ class wxAcceleratorTablePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def __del__(self,miscc=miscc):
+        if self.thisown == 1 :
+            miscc.delete_wxAcceleratorTable(self)
     def __repr__(self):
-        return "<C wxAcceleratorTable instance>"
+        return "<C wxAcceleratorTable instance at %s>" % (self.this,)
 class wxAcceleratorTable(wxAcceleratorTablePtr):
-    def __init__(self,arg0) :
-        self.this = miscc.new_wxAcceleratorTable(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxAcceleratorTable,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxBusyInfoPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,miscc=miscc):
+        if self.thisown == 1 :
+            miscc.delete_wxBusyInfo(self)
+    def __repr__(self):
+        return "<C wxBusyInfo instance at %s>" % (self.this,)
+class wxBusyInfo(wxBusyInfoPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxBusyInfo,_args,_kwargs)
         self.thisown = 1
 
 
@@ -495,53 +567,7 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
-def wxFileSelector(arg0,*args):
-    argl = map(None,args)
-    try: argl[5] = argl[5].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxFileSelector,(arg0,)+args)
-    return val
-
-def wxGetTextFromUser(arg0,*args):
-    argl = map(None,args)
-    try: argl[2] = argl[2].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxGetTextFromUser,(arg0,)+args)
-    return val
-
-def wxGetSingleChoice(arg0,arg1,arg2,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxGetSingleChoice,(arg0,arg1,arg2,)+args)
-    return val
-
-def wxGetSingleChoiceIndex(arg0,arg1,arg2,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxGetSingleChoiceIndex,(arg0,arg1,arg2,)+args)
-    return val
-
-def wxMessageBox(arg0,*args):
-    argl = map(None,args)
-    try: argl[2] = argl[2].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxMessageBox,(arg0,)+args)
-    return val
-
-wxColourDisplay = miscc.wxColourDisplay
-
-wxDisplayDepth = miscc.wxDisplayDepth
-
-def wxSetCursor(arg0):
-    val = miscc.wxSetCursor(arg0.this)
-    return val
+wxIntersectRect = miscc.wxIntersectRect
 
 wxNewId = miscc.wxNewId
 
@@ -551,14 +577,6 @@ NewId = miscc.NewId
 
 RegisterId = miscc.RegisterId
 
-def wxBeginBusyCursor(*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxBeginBusyCursor,()+args)
-    return val
-
 wxBell = miscc.wxBell
 
 wxDisplaySize = miscc.wxDisplaySize
@@ -567,12 +585,20 @@ wxEndBusyCursor = miscc.wxEndBusyCursor
 
 wxExecute = miscc.wxExecute
 
+wxGetElapsedTime = miscc.wxGetElapsedTime
+
 wxGetMousePosition = miscc.wxGetMousePosition
 
 wxIsBusy = miscc.wxIsBusy
 
 wxNow = miscc.wxNow
 
+wxShell = miscc.wxShell
+
+wxStartTimer = miscc.wxStartTimer
+
+wxGetOsVersion = miscc.wxGetOsVersion
+
 wxSleep = miscc.wxSleep
 
 wxYield = miscc.wxYield
@@ -583,34 +609,7 @@ wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
 
 wxGetResource = miscc.wxGetResource
 
-wxResourceAddIdentifier = miscc.wxResourceAddIdentifier
-
-wxResourceClear = miscc.wxResourceClear
-
-def wxResourceCreateBitmap(arg0):
-    val = miscc.wxResourceCreateBitmap(arg0)
-    val = wxBitmapPtr(val)
-    val.thisown = 1
-    return val
-
-def wxResourceCreateIcon(arg0):
-    val = miscc.wxResourceCreateIcon(arg0)
-    val = wxIconPtr(val)
-    val.thisown = 1
-    return val
-
-def wxResourceCreateMenuBar(arg0):
-    val = miscc.wxResourceCreateMenuBar(arg0)
-    val = wxMenuBarPtr(val)
-    return val
-
-wxResourceGetIdentifier = miscc.wxResourceGetIdentifier
-
-wxResourceParseData = miscc.wxResourceParseData
-
-wxResourceParseFile = miscc.wxResourceParseFile
-
-wxResourceParseString = miscc.wxResourceParseString
+wxStripMenuCodes = miscc.wxStripMenuCodes