]> git.saurik.com Git - wxWidgets.git/blobdiff - utils/wxPython/src/gtk/misc.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Compilation fixes
[wxWidgets.git] / utils / wxPython / src / gtk / misc.py
diff --git a/utils/wxPython/src/gtk/misc.py b/utils/wxPython/src/gtk/misc.py
index cfc622abe1bfb053b571178d447db0fe17865954..66328577936953da8d5e2982e4c0a0fe27281235 100644 (file)
--- a/utils/wxPython/src/gtk/misc.py
+++ b/utils/wxPython/src/gtk/misc.py
@@ -4,40 +4,64 @@ class wxSizePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
         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
         return val
-    def GetWidth(self):
-        val = miscc.wxSize_GetWidth(self.this)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetX,(self,) + _args, _kwargs)
         return val
         return val
-    def GetHeight(self):
-        val = miscc.wxSize_GetHeight(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetY,(self,) + _args, _kwargs)
         return val
         return val
-    def __str__(self):
-        val = miscc.wxSize___str__(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetWidth,(self,) + _args, _kwargs)
+        return val
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_GetHeight,(self,) + _args, _kwargs)
+        return val
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_SetWidth,(self,) + _args, _kwargs)
+        return val
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_SetHeight,(self,) + _args, _kwargs)
+        return val
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxSize_asTuple,(self,) + _args, _kwargs)
         return val
     def __setattr__(self,name,value):
         return val
     def __setattr__(self,name,value):
+        if name == "x" :
+            miscc.wxSize_x_set(self,value)
+            return
+        if name == "y" :
+            miscc.wxSize_y_set(self,value)
+            return
         if name == "width" :
         if name == "width" :
-            miscc.wxSize_width_set(self.this,value)
+            miscc.wxSize_width_set(self,value)
             return
         if name == "height" :
             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):
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
+        if name == "x" : 
+            return miscc.wxSize_x_get(self)
+        if name == "y" : 
+            return miscc.wxSize_y_get(self)
         if name == "width" : 
         if name == "width" : 
-            return miscc.wxSize_width_get(self.this)
+            return miscc.wxSize_width_get(self)
         if name == "height" : 
         if name == "height" : 
-            return miscc.wxSize_height_get(self.this)
+            return miscc.wxSize_height_get(self)
         raise AttributeError,name
     def __repr__(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):
 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
 
 
         self.thisown = 1
 
 
@@ -47,28 +71,36 @@ class wxRealPointPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
         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" :
     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" :
             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
         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" : 
         if name == "y" : 
-            return miscc.wxRealPoint_y_get(self.this)
+            return miscc.wxRealPoint_y_get(self)
         raise AttributeError,name
     def __repr__(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):
 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
 
 
         self.thisown = 1
 
 
@@ -78,34 +110,36 @@ class wxPointPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
         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
         return val
-    def __str__(self):
-        val = miscc.wxPoint___str__(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" :
         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" :
             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
         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" : 
         if name == "y" : 
-            return miscc.wxPoint_y_get(self.this)
+            return miscc.wxPoint_y_get(self)
         raise AttributeError,name
     def __repr__(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):
 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
 
 
         self.thisown = 1
 
 
@@ -115,84 +149,137 @@ class wxRectPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
         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
         return val
-    def SetX(self,arg0):
-        val = miscc.wxRect_SetX(self.this,arg0)
+    def SetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetX,(self,) + _args, _kwargs)
         return val
         return val
-    def GetY(self):
-        val = miscc.wxRect_GetY(self.this)
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetY,(self,) + _args, _kwargs)
         return val
         return val
-    def SetY(self,arg0):
-        val = miscc.wxRect_SetY(self.this,arg0)
+    def SetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetY,(self,) + _args, _kwargs)
         return val
         return val
-    def GetWidth(self):
-        val = miscc.wxRect_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetWidth,(self,) + _args, _kwargs)
         return val
         return val
-    def SetWidth(self,arg0):
-        val = miscc.wxRect_SetWidth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetWidth,(self,) + _args, _kwargs)
         return val
         return val
-    def GetHeight(self):
-        val = miscc.wxRect_GetHeight(self.this)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetHeight,(self,) + _args, _kwargs)
         return val
         return val
-    def SetHeight(self,arg0):
-        val = miscc.wxRect_SetHeight(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetHeight,(self,) + _args, _kwargs)
         return val
         return val
-    def GetPosition(self):
-        val = miscc.wxRect_GetPosition(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetPosition(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
         return val
-    def GetSize(self):
-        val = miscc.wxRect_GetSize(self.this)
-        val = wxSizePtr(val)
-        val.thisown = 1
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
         return val
-    def GetLeft(self):
-        val = miscc.wxRect_GetLeft(self.this)
+    def GetLeft(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetLeft,(self,) + _args, _kwargs)
         return val
         return val
-    def GetTop(self):
-        val = miscc.wxRect_GetTop(self.this)
+    def GetTop(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetTop,(self,) + _args, _kwargs)
         return val
         return val
-    def GetBottom(self):
-        val = miscc.wxRect_GetBottom(self.this)
+    def GetBottom(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetBottom,(self,) + _args, _kwargs)
         return val
         return val
-    def GetRight(self):
-        val = miscc.wxRect_GetRight(self.this)
+    def GetRight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_GetRight,(self,) + _args, _kwargs)
+        return val
+    def SetLeft(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetLeft,(self,) + _args, _kwargs)
+        return val
+    def SetRight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRect_SetRight,(self,) + _args, _kwargs)
+        return val
+    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" :
         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" :
             return
         if name == "y" :
-            miscc.wxRect_y_set(self.this,value)
+            miscc.wxRect_y_set(self,value)
             return
         if name == "width" :
             return
         if name == "width" :
-            miscc.wxRect_width_set(self.this,value)
+            miscc.wxRect_width_set(self,value)
             return
         if name == "height" :
             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
         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" : 
         if name == "y" : 
-            return miscc.wxRect_y_get(self.this)
+            return miscc.wxRect_y_get(self)
         if name == "width" : 
         if name == "width" : 
-            return miscc.wxRect_width_get(self.this)
+            return miscc.wxRect_width_get(self)
         if name == "height" : 
         if name == "height" : 
-            return miscc.wxRect_height_get(self.this)
+            return miscc.wxRect_height_get(self)
         raise AttributeError,name
     def __repr__(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())
+    
+    # override the __getattr__ made by SWIG
+    def __getattr__(self, name):
+        d = {
+            'x' : miscc.wxRect_x_get,
+            'y' : miscc.wxRect_y_get,
+            'width' : miscc.wxRect_width_get,
+            'height' : miscc.wxRect_height_get,
+            'top' : miscc.wxRect_GetTop,
+            'bottom' : miscc.wxRect_GetBottom,
+            'left' : miscc.wxRect_GetLeft,
+            'right' : miscc.wxRect_GetRight,
+            }
+        try:
+            func = d[name]
+        except KeyError:
+            raise AttributeError,name
+        return func(self)
+
+    # and also the __setattr__
+    def __setattr__(self, name, value):
+        d = {
+            'x' : miscc.wxRect_x_set,
+            'y' : miscc.wxRect_y_set,
+            'width' : miscc.wxRect_width_set,
+            'height' : miscc.wxRect_height_set,
+            'top' : miscc.wxRect_SetTop,
+            'bottom' : miscc.wxRect_SetBottom,
+            'left' : miscc.wxRect_SetLeft,
+            'right' : miscc.wxRect_SetRight,
+            }
+        try:
+            func = d[name]
+        except KeyError:
+            self.__dict__[name] = value
+            return
+        func(self, value)
+    
 class wxRect(wxRectPtr):
 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
 
 
         self.thisown = 1
 
 
@@ -202,23 +289,26 @@ class wxPyTimerPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
+    def __del__(self,miscc=miscc):
         if self.thisown == 1 :
         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
         return val
-    def Start(self,*args):
-        val = apply(miscc.wxPyTimer_Start,(self.this,)+args)
+    def IsOneShot(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_IsOneShot,(self,) + _args, _kwargs)
         return val
         return val
-    def Stop(self):
-        val = miscc.wxPyTimer_Stop(self.this)
+    def Start(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_Start,(self,) + _args, _kwargs)
+        return val
+    def Stop(self, *_args, **_kwargs):
+        val = apply(miscc.wxPyTimer_Stop,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return val
     def __repr__(self):
-        return "<C wxPyTimer instance>"
+        return "<C wxPyTimer instance at %s>" % (self.this,)
 class wxPyTimer(wxPyTimerPtr):
 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
 
 
         self.thisown = 1
 
 
@@ -228,38 +318,38 @@ class wxIndividualLayoutConstraintPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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
         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
         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
         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
         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
         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
         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
         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
         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
         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 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
 class wxIndividualLayoutConstraint(wxIndividualLayoutConstraintPtr):
     def __init__(self,this):
         self.this = this
@@ -273,53 +363,176 @@ class wxLayoutConstraintsPtr :
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "bottom" :
         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" :
             return
         if name == "centreX" :
-            miscc.wxLayoutConstraints_centreX_set(self.this,value.this)
+            miscc.wxLayoutConstraints_centreX_set(self,value.this)
             return
         if name == "centreY" :
             return
         if name == "centreY" :
-            miscc.wxLayoutConstraints_centreY_set(self.this,value.this)
+            miscc.wxLayoutConstraints_centreY_set(self,value.this)
             return
         if name == "height" :
             return
         if name == "height" :
-            miscc.wxLayoutConstraints_height_set(self.this,value.this)
+            miscc.wxLayoutConstraints_height_set(self,value.this)
             return
         if name == "left" :
             return
         if name == "left" :
-            miscc.wxLayoutConstraints_left_set(self.this,value.this)
+            miscc.wxLayoutConstraints_left_set(self,value.this)
             return
         if name == "right" :
             return
         if name == "right" :
-            miscc.wxLayoutConstraints_right_set(self.this,value.this)
+            miscc.wxLayoutConstraints_right_set(self,value.this)
             return
         if name == "top" :
             return
         if name == "top" :
-            miscc.wxLayoutConstraints_top_set(self.this,value.this)
+            miscc.wxLayoutConstraints_top_set(self,value.this)
             return
         if name == "width" :
             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
         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" : 
         if name == "centreX" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreX_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreX_get(self))
         if name == "centreY" : 
         if name == "centreY" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreY_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_centreY_get(self))
         if name == "height" : 
         if name == "height" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_height_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_height_get(self))
         if name == "left" : 
         if name == "left" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_left_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_left_get(self))
         if name == "right" : 
         if name == "right" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_right_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_right_get(self))
         if name == "top" : 
         if name == "top" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_top_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_top_get(self))
         if name == "width" : 
         if name == "width" : 
-            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self.this))
+            return wxIndividualLayoutConstraintPtr(miscc.wxLayoutConstraints_width_get(self))
         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):
-        return "<C wxLayoutConstraints instance>"
+        return "<C wxLayoutConstraints instance at %s>" % (self.this,)
 class wxLayoutConstraints(wxLayoutConstraintsPtr):
 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
+
+
+
+
+class wxRegionPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,miscc=miscc):
+        if self.thisown == 1 :
+            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 ContainsRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsRect,(self,) + _args, _kwargs)
+        return val
+    def ContainsRectDim(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_ContainsRectDim,(self,) + _args, _kwargs)
+        return val
+    def GetBox(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_GetBox,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
+        return val
+    def Intersect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)
+        return val
+    def IntersectRect(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IntersectRect,(self,) + _args, _kwargs)
+        return val
+    def IntersectRegion(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IntersectRegion,(self,) + _args, _kwargs)
+        return val
+    def IsEmpty(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)
+        return val
+    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 at %s>" % (self.this,)
+class wxRegion(wxRegionPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRegion,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxRegionIteratorPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,miscc=miscc):
+        if self.thisown == 1 :
+            miscc.delete_wxRegionIterator(self)
+    def GetX(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetX,(self,) + _args, _kwargs)
+        return val
+    def GetY(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetY,(self,) + _args, _kwargs)
+        return val
+    def GetW(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetW,(self,) + _args, _kwargs)
+        return val
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetWidth,(self,) + _args, _kwargs)
+        return val
+    def GetH(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetH,(self,) + _args, _kwargs)
+        return val
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_GetHeight,(self,) + _args, _kwargs)
+        return val
+    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, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_HaveRects,(self,) + _args, _kwargs)
+        return val
+    def Reset(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_Reset,(self,) + _args, _kwargs)
+        return val
+    def Next(self, *_args, **_kwargs):
+        val = apply(miscc.wxRegionIterator_Next,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxRegionIterator instance at %s>" % (self.this,)
+class wxRegionIterator(wxRegionIteratorPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(miscc.new_wxRegionIterator,_args,_kwargs)
         self.thisown = 1
 
 
         self.thisown = 1
 
 
@@ -329,23 +542,26 @@ class wxAcceleratorEntryPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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
         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
         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
         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 val
     def __repr__(self):
-        return "<C wxAcceleratorEntry instance>"
+        return "<C wxAcceleratorEntry instance at %s>" % (self.this,)
 class wxAcceleratorEntry(wxAcceleratorEntryPtr):
 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
 
 
         self.thisown = 1
 
 
@@ -355,11 +571,31 @@ class wxAcceleratorTablePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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):
     def __repr__(self):
-        return "<C wxAcceleratorTable instance>"
+        return "<C wxAcceleratorTable instance at %s>" % (self.this,)
 class wxAcceleratorTable(wxAcceleratorTablePtr):
 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
 
 
         self.thisown = 1
 
 
@@ -369,66 +605,16 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- 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
+
+wxRegisterId = miscc.wxRegisterId
 
 NewId = miscc.NewId
 
 RegisterId = miscc.RegisterId
 
 
 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
 wxBell = miscc.wxBell
 
 wxDisplaySize = miscc.wxDisplaySize
@@ -437,23 +623,7 @@ wxEndBusyCursor = miscc.wxEndBusyCursor
 
 wxExecute = miscc.wxExecute
 
 
 wxExecute = miscc.wxExecute
 
-def wxFindWindowByLabel(arg0,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxFindWindowByLabel,(arg0,)+args)
-    val = wxWindowPtr(val)
-    return val
-
-def wxFindWindowByName(arg0,*args):
-    argl = map(None,args)
-    try: argl[0] = argl[0].this
-    except: pass
-    args = tuple(argl)
-    val = apply(miscc.wxFindWindowByName,(arg0,)+args)
-    val = wxWindowPtr(val)
-    return val
+wxGetElapsedTime = miscc.wxGetElapsedTime
 
 wxGetMousePosition = miscc.wxGetMousePosition
 
 
 wxGetMousePosition = miscc.wxGetMousePosition
 
@@ -461,38 +631,23 @@ wxIsBusy = miscc.wxIsBusy
 
 wxNow = miscc.wxNow
 
 
 wxNow = miscc.wxNow
 
-wxYield = miscc.wxYield
+wxShell = miscc.wxShell
 
 
-wxGetResource = miscc.wxGetResource
-
-wxResourceAddIdentifier = miscc.wxResourceAddIdentifier
-
-wxResourceClear = miscc.wxResourceClear
+wxStartTimer = miscc.wxStartTimer
 
 
-def wxResourceCreateBitmap(arg0):
-    val = miscc.wxResourceCreateBitmap(arg0)
-    val = wxBitmapPtr(val)
-    val.thisown = 1
-    return val
+wxGetOsVersion = miscc.wxGetOsVersion
 
 
-def wxResourceCreateIcon(arg0):
-    val = miscc.wxResourceCreateIcon(arg0)
-    val = wxIconPtr(val)
-    val.thisown = 1
-    return val
+wxSleep = miscc.wxSleep
 
 
-def wxResourceCreateMenuBar(arg0):
-    val = miscc.wxResourceCreateMenuBar(arg0)
-    val = wxMenuBarPtr(val)
-    return val
+wxYield = miscc.wxYield
 
 
-wxResourceGetIdentifier = miscc.wxResourceGetIdentifier
+wxSafeYield = miscc.wxSafeYield
 
 
-wxResourceParseData = miscc.wxResourceParseData
+wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
 
 
-wxResourceParseFile = miscc.wxResourceParseFile
+wxGetResource = miscc.wxGetResource
 
 
-wxResourceParseString = miscc.wxResourceParseString
+wxStripMenuCodes = miscc.wxStripMenuCodes
 
 
 
 
 
 
@@ -517,3 +672,6 @@ wxLeftOf = miscc.wxLeftOf
 wxRightOf = miscc.wxRightOf
 wxSameAs = miscc.wxSameAs
 wxAbsolute = miscc.wxAbsolute
 wxRightOf = miscc.wxRightOf
 wxSameAs = miscc.wxSameAs
 wxAbsolute = miscc.wxAbsolute
+wxOutRegion = miscc.wxOutRegion
+wxPartRegion = miscc.wxPartRegion
+wxInRegion = miscc.wxInRegion
wxWidgets (Impactor)