X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7108497a54ee5de03bcea8de85e2750116c223e6..e04fe03d0f0d5cda7f9c2712ed3a65988839002c:/wxPython/src/mac/misc.py

diff --git a/wxPython/src/mac/misc.py b/wxPython/src/mac/misc.py
index e1f06cc4f9..8792a0122c 100644
--- a/wxPython/src/mac/misc.py
+++ b/wxPython/src/mac/misc.py
@@ -5,13 +5,13 @@ class wxObjectPtr :
         self.this = this
         self.thisown = 0
     def GetClassName(self, *_args, **_kwargs):
-        val = apply(miscc.wxObject_GetClassName,(self,) + _args, _kwargs)
+        val = miscc.wxObject_GetClassName(self, *_args, **_kwargs)
         return val
     def Destroy(self, *_args, **_kwargs):
-        val = apply(miscc.wxObject_Destroy,(self,) + _args, _kwargs)
+        val = miscc.wxObject_Destroy(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxObject instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxObject(wxObjectPtr):
     def __init__(self,this):
         self.this = this
@@ -30,34 +30,40 @@ class wxSizePtr :
             except:
                 pass
     def Set(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs)
+        val = miscc.wxSize_Set(self, *_args, **_kwargs)
         return val
     def GetX(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_GetX,(self,) + _args, _kwargs)
+        val = miscc.wxSize_GetX(self, *_args, **_kwargs)
         return val
     def GetY(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_GetY,(self,) + _args, _kwargs)
+        val = miscc.wxSize_GetY(self, *_args, **_kwargs)
         return val
     def GetWidth(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_GetWidth,(self,) + _args, _kwargs)
+        val = miscc.wxSize_GetWidth(self, *_args, **_kwargs)
         return val
     def GetHeight(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_GetHeight,(self,) + _args, _kwargs)
+        val = miscc.wxSize_GetHeight(self, *_args, **_kwargs)
         return val
     def SetWidth(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_SetWidth,(self,) + _args, _kwargs)
+        val = miscc.wxSize_SetWidth(self, *_args, **_kwargs)
         return val
     def SetHeight(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_SetHeight,(self,) + _args, _kwargs)
+        val = miscc.wxSize_SetHeight(self, *_args, **_kwargs)
+        return val
+    def IncTo(self, *_args, **_kwargs):
+        val = miscc.wxSize_IncTo(self, *_args, **_kwargs)
+        return val
+    def DecTo(self, *_args, **_kwargs):
+        val = miscc.wxSize_DecTo(self, *_args, **_kwargs)
         return val
     def asTuple(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize_asTuple,(self,) + _args, _kwargs)
+        val = miscc.wxSize_asTuple(self, *_args, **_kwargs)
         return val
     def __eq__(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize___eq__,(self,) + _args, _kwargs)
+        val = miscc.wxSize___eq__(self, *_args, **_kwargs)
         return val
     def __ne__(self, *_args, **_kwargs):
-        val = apply(miscc.wxSize___ne__,(self,) + _args, _kwargs)
+        val = miscc.wxSize___ne__(self, *_args, **_kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "x" :
@@ -84,7 +90,7 @@ class wxSizePtr :
             return miscc.wxSize_height_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxSize instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxSize instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def __str__(self):                   return str(self.asTuple())
     def __repr__(self):                  return 'wxSize'+str(self.asTuple())
@@ -101,7 +107,7 @@ class wxSizePtr :
 
 class wxSize(wxSizePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxSize,_args,_kwargs)
+        self.this = miscc.new_wxSize(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -118,24 +124,24 @@ class wxRealPointPtr :
             except:
                 pass
     def Set(self, *_args, **_kwargs):
-        val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs)
+        val = miscc.wxRealPoint_Set(self, *_args, **_kwargs)
         return val
     def asTuple(self, *_args, **_kwargs):
-        val = apply(miscc.wxRealPoint_asTuple,(self,) + _args, _kwargs)
+        val = miscc.wxRealPoint_asTuple(self, *_args, **_kwargs)
         return val
     def __add__(self, *_args, **_kwargs):
-        val = apply(miscc.wxRealPoint___add__,(self,) + _args, _kwargs)
+        val = miscc.wxRealPoint___add__(self, *_args, **_kwargs)
         if val: val = wxRealPointPtr(val) ; val.thisown = 1
         return val
     def __sub__(self, *_args, **_kwargs):
-        val = apply(miscc.wxRealPoint___sub__,(self,) + _args, _kwargs)
+        val = miscc.wxRealPoint___sub__(self, *_args, **_kwargs)
         if val: val = wxRealPointPtr(val) ; val.thisown = 1
         return val
     def __eq__(self, *_args, **_kwargs):
-        val = apply(miscc.wxRealPoint___eq__,(self,) + _args, _kwargs)
+        val = miscc.wxRealPoint___eq__(self, *_args, **_kwargs)
         return val
     def __ne__(self, *_args, **_kwargs):
-        val = apply(miscc.wxRealPoint___ne__,(self,) + _args, _kwargs)
+        val = miscc.wxRealPoint___ne__(self, *_args, **_kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "x" :
@@ -152,7 +158,7 @@ class wxRealPointPtr :
             return miscc.wxRealPoint_y_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxRealPoint instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxRealPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def __str__(self):                   return str(self.asTuple())
     def __repr__(self):                  return 'wxRealPoint'+str(self.asTuple())
@@ -169,7 +175,7 @@ class wxRealPointPtr :
 
 class wxRealPoint(wxRealPointPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxRealPoint,_args,_kwargs)
+        self.this = miscc.new_wxRealPoint(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -186,24 +192,24 @@ class wxPointPtr :
             except:
                 pass
     def Set(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs)
+        val = miscc.wxPoint_Set(self, *_args, **_kwargs)
         return val
     def asTuple(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint_asTuple,(self,) + _args, _kwargs)
+        val = miscc.wxPoint_asTuple(self, *_args, **_kwargs)
         return val
     def __add__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint___add__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint___add__(self, *_args, **_kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def __sub__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint___sub__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint___sub__(self, *_args, **_kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def __eq__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint___eq__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint___eq__(self, *_args, **_kwargs)
         return val
     def __ne__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint___ne__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint___ne__(self, *_args, **_kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "x" :
@@ -220,7 +226,7 @@ class wxPointPtr :
             return miscc.wxPoint_y_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxPoint instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def __str__(self):                   return str(self.asTuple())
     def __repr__(self):                  return 'wxPoint'+str(self.asTuple())
@@ -237,7 +243,7 @@ class wxPointPtr :
 
 class wxPoint(wxPointPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxPoint,_args,_kwargs)
+        self.this = miscc.new_wxPoint(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -254,103 +260,103 @@ class wxRectPtr :
             except:
                 pass
     def GetX(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetX(self, *_args, **_kwargs)
         return val
     def SetX(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetX,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetX(self, *_args, **_kwargs)
         return val
     def GetY(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetY,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetY(self, *_args, **_kwargs)
         return val
     def SetY(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetY,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetY(self, *_args, **_kwargs)
         return val
     def GetWidth(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetWidth,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetWidth(self, *_args, **_kwargs)
         return val
     def SetWidth(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetWidth,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetWidth(self, *_args, **_kwargs)
         return val
     def GetHeight(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetHeight,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetHeight(self, *_args, **_kwargs)
         return val
     def SetHeight(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetHeight,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetHeight(self, *_args, **_kwargs)
         return val
     def GetPosition(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetPosition,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetPosition(self, *_args, **_kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetSize(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetSize,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetSize(self, *_args, **_kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def SetPosition(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetPosition,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetPosition(self, *_args, **_kwargs)
         return val
     def SetSize(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetSize,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetSize(self, *_args, **_kwargs)
         return val
     def GetLeft(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetLeft,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetLeft(self, *_args, **_kwargs)
         return val
     def GetTop(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetTop,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetTop(self, *_args, **_kwargs)
         return val
     def GetBottom(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetBottom,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetBottom(self, *_args, **_kwargs)
         return val
     def GetRight(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs)
+        val = miscc.wxRect_GetRight(self, *_args, **_kwargs)
         return val
     def SetLeft(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetLeft,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetLeft(self, *_args, **_kwargs)
         return val
     def SetRight(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetRight,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetRight(self, *_args, **_kwargs)
         return val
     def SetTop(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetTop,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetTop(self, *_args, **_kwargs)
         return val
     def SetBottom(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_SetBottom,(self,) + _args, _kwargs)
+        val = miscc.wxRect_SetBottom(self, *_args, **_kwargs)
         return val
     def Deflate(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_Deflate,(self,) + _args, _kwargs)
+        val = miscc.wxRect_Deflate(self, *_args, **_kwargs)
         return val
     def Inflate(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_Inflate,(self,) + _args, _kwargs)
+        val = miscc.wxRect_Inflate(self, *_args, **_kwargs)
         return val
     def InsideXY(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_InsideXY,(self,) + _args, _kwargs)
+        val = miscc.wxRect_InsideXY(self, *_args, **_kwargs)
         return val
     def Inside(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_Inside,(self,) + _args, _kwargs)
+        val = miscc.wxRect_Inside(self, *_args, **_kwargs)
         return val
     def Intersects(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_Intersects,(self,) + _args, _kwargs)
+        val = miscc.wxRect_Intersects(self, *_args, **_kwargs)
         return val
     def OffsetXY(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_OffsetXY,(self,) + _args, _kwargs)
+        val = miscc.wxRect_OffsetXY(self, *_args, **_kwargs)
         return val
     def Offset(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_Offset,(self,) + _args, _kwargs)
+        val = miscc.wxRect_Offset(self, *_args, **_kwargs)
         return val
     def Set(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_Set,(self,) + _args, _kwargs)
+        val = miscc.wxRect_Set(self, *_args, **_kwargs)
         return val
     def asTuple(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect_asTuple,(self,) + _args, _kwargs)
+        val = miscc.wxRect_asTuple(self, *_args, **_kwargs)
         return val
     def __add__(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect___add__,(self,) + _args, _kwargs)
+        val = miscc.wxRect___add__(self, *_args, **_kwargs)
         if val: val = wxRectPtr(val) ; val.thisown = 1
         return val
     def __eq__(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect___eq__,(self,) + _args, _kwargs)
+        val = miscc.wxRect___eq__(self, *_args, **_kwargs)
         return val
     def __ne__(self, *_args, **_kwargs):
-        val = apply(miscc.wxRect___ne__,(self,) + _args, _kwargs)
+        val = miscc.wxRect___ne__(self, *_args, **_kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "x" :
@@ -377,7 +383,7 @@ class wxRectPtr :
             return miscc.wxRect_height_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxRect instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxRect instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def __str__(self):                   return str(self.asTuple())
     def __repr__(self):                  return 'wxRect'+str(self.asTuple())
@@ -433,7 +439,7 @@ class wxRectPtr :
     
 class wxRect(wxRectPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxRect,_args,_kwargs)
+        self.this = miscc.new_wxRect(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -444,66 +450,66 @@ class wxPoint2DDoublePtr :
         self.this = this
         self.thisown = 0
     def GetFloor(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetFloor,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetFloor(self, *_args, **_kwargs)
         return val
     def GetRounded(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetRounded,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetRounded(self, *_args, **_kwargs)
         return val
     def GetVectorLength(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetVectorLength,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetVectorLength(self, *_args, **_kwargs)
         return val
     def GetVectorAngle(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetVectorAngle,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetVectorAngle(self, *_args, **_kwargs)
         return val
     def SetVectorLength(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_SetVectorLength,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_SetVectorLength(self, *_args, **_kwargs)
         return val
     def SetVectorAngle(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_SetVectorAngle,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_SetVectorAngle(self, *_args, **_kwargs)
         return val
     def GetDistance(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetDistance,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetDistance(self, *_args, **_kwargs)
         return val
     def GetDistanceSquare(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetDistanceSquare,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetDistanceSquare(self, *_args, **_kwargs)
         return val
     def GetDotProduct(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetDotProduct,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetDotProduct(self, *_args, **_kwargs)
         return val
     def GetCrossProduct(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_GetCrossProduct,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_GetCrossProduct(self, *_args, **_kwargs)
         return val
     def Set(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_Set,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_Set(self, *_args, **_kwargs)
         return val
     def __neg__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble___neg__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble___neg__(self, *_args, **_kwargs)
         if val: val = wxPoint2DDoublePtr(val) ; val.thisown = 1
         return val
     def __iadd__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble___iadd__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble___iadd__(self, *_args, **_kwargs)
         if val: val = wxPoint2DDoublePtr(val) 
         return val
     def __isub__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble___isub__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble___isub__(self, *_args, **_kwargs)
         if val: val = wxPoint2DDoublePtr(val) 
         return val
     def __imul__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble___imul__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble___imul__(self, *_args, **_kwargs)
         if val: val = wxPoint2DDoublePtr(val) 
         return val
     def __idiv__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble___idiv__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble___idiv__(self, *_args, **_kwargs)
         if val: val = wxPoint2DDoublePtr(val) 
         return val
     def __eq__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble___eq__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble___eq__(self, *_args, **_kwargs)
         return val
     def __ne__(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble___ne__,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble___ne__(self, *_args, **_kwargs)
         return val
     def asTuple(self, *_args, **_kwargs):
-        val = apply(miscc.wxPoint2DDouble_asTuple,(self,) + _args, _kwargs)
+        val = miscc.wxPoint2DDouble_asTuple(self, *_args, **_kwargs)
         return val
     def __setattr__(self,name,value):
         if name == "m_x" :
@@ -530,7 +536,7 @@ class wxPoint2DDoublePtr :
             return miscc.wxPoint2DDouble_y_get(self)
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxPoint2DDouble instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPoint2DDouble instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     
     def SetPolarCoordinates(self, angle, length):
         self.SetVectorLength(length)
@@ -554,18 +560,18 @@ class wxPoint2DDoublePtr :
 
 class wxPoint2DDouble(wxPoint2DDoublePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxPoint2DDouble,_args,_kwargs)
+        self.this = miscc.new_wxPoint2DDouble(*_args,**_kwargs)
         self.thisown = 1
 
 
 
 def wxPoint2DDoubleCopy(*_args,**_kwargs):
-    val = wxPoint2DDoublePtr(apply(miscc.new_wxPoint2DDoubleCopy,_args,_kwargs))
+    val = wxPoint2DDoublePtr(miscc.new_wxPoint2DDoubleCopy(*_args,**_kwargs))
     val.thisown = 1
     return val
 
 def wxPoint2DDoubleFromPoint(*_args,**_kwargs):
-    val = wxPoint2DDoublePtr(apply(miscc.new_wxPoint2DDoubleFromPoint,_args,_kwargs))
+    val = wxPoint2DDoublePtr(miscc.new_wxPoint2DDoubleFromPoint(*_args,**_kwargs))
     val.thisown = 1
     return val
 
@@ -575,37 +581,37 @@ class wxIndividualLayoutConstraintPtr(wxObjectPtr):
         self.this = this
         self.thisown = 0
     def Above(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_Above,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_Above(self, *_args, **_kwargs)
         return val
     def Absolute(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_Absolute,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_Absolute(self, *_args, **_kwargs)
         return val
     def AsIs(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_AsIs,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_AsIs(self, *_args, **_kwargs)
         return val
     def Below(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_Below,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_Below(self, *_args, **_kwargs)
         return val
     def Unconstrained(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_Unconstrained,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_Unconstrained(self, *_args, **_kwargs)
         return val
     def LeftOf(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_LeftOf,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_LeftOf(self, *_args, **_kwargs)
         return val
     def PercentOf(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_PercentOf,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_PercentOf(self, *_args, **_kwargs)
         return val
     def RightOf(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_RightOf,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_RightOf(self, *_args, **_kwargs)
         return val
     def SameAs(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_SameAs,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_SameAs(self, *_args, **_kwargs)
         return val
     def Set(self, *_args, **_kwargs):
-        val = apply(miscc.wxIndividualLayoutConstraint_Set,(self,) + _args, _kwargs)
+        val = miscc.wxIndividualLayoutConstraint_Set(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxIndividualLayoutConstraint instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxIndividualLayoutConstraint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr):
     def __init__(self,this):
         self.this = this
@@ -662,10 +668,10 @@ class wxLayoutConstraintsPtr(wxObjectPtr):
             return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self))
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxLayoutConstraints instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxLayoutConstraints instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxLayoutConstraints(wxLayoutConstraintsPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxLayoutConstraints,_args,_kwargs)
+        self.this = miscc.new_wxLayoutConstraints(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -682,22 +688,22 @@ class wxAcceleratorEntryPtr :
             except:
                 pass
     def Set(self, *_args, **_kwargs):
-        val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs)
+        val = miscc.wxAcceleratorEntry_Set(self, *_args, **_kwargs)
         return val
     def GetFlags(self, *_args, **_kwargs):
-        val = apply(miscc.wxAcceleratorEntry_GetFlags,(self,) + _args, _kwargs)
+        val = miscc.wxAcceleratorEntry_GetFlags(self, *_args, **_kwargs)
         return val
     def GetKeyCode(self, *_args, **_kwargs):
-        val = apply(miscc.wxAcceleratorEntry_GetKeyCode,(self,) + _args, _kwargs)
+        val = miscc.wxAcceleratorEntry_GetKeyCode(self, *_args, **_kwargs)
         return val
     def GetCommand(self, *_args, **_kwargs):
-        val = apply(miscc.wxAcceleratorEntry_GetCommand,(self,) + _args, _kwargs)
+        val = miscc.wxAcceleratorEntry_GetCommand(self, *_args, **_kwargs)
         return val
     def __repr__(self):
-        return "<C wxAcceleratorEntry instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxAcceleratorEntry instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxAcceleratorEntry(wxAcceleratorEntryPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxAcceleratorEntry,_args,_kwargs)
+        self.this = miscc.new_wxAcceleratorEntry(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -714,10 +720,10 @@ class wxAcceleratorTablePtr(wxObjectPtr):
             except:
                 pass
     def __repr__(self):
-        return "<C wxAcceleratorTable instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxAcceleratorTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxAcceleratorTable(wxAcceleratorTablePtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxAcceleratorTable,_args,_kwargs)
+        self.this = miscc.new_wxAcceleratorTable(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -734,10 +740,10 @@ class wxBusyInfoPtr(wxObjectPtr):
             except:
                 pass
     def __repr__(self):
-        return "<C wxBusyInfo instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxBusyInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxBusyInfo(wxBusyInfoPtr):
     def __init__(self,*_args,**_kwargs):
-        self.this = apply(miscc.new_wxBusyInfo,_args,_kwargs)
+        self.this = miscc.new_wxBusyInfo(*_args,**_kwargs)
         self.thisown = 1
 
 
@@ -805,8 +811,10 @@ wxGetUserHome = miscc.wxGetUserHome
 
 wxGetProcessId = miscc.wxGetProcessId
 
+wxTrap = miscc.wxTrap
+
 def wxGetAccelFromString(*_args, **_kwargs):
-    val = apply(miscc.wxGetAccelFromString,_args,_kwargs)
+    val = miscc.wxGetAccelFromString(*_args,**_kwargs)
     if val: val = wxAcceleratorEntryPtr(val)
     return val