Added OGL to contrib

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

diff --git a/utils/wxPython/src/gtk/gdi.py b/utils/wxPython/src/gtk/gdi.py
index 05e3e899e9722e0c6494cd0f9ef42edbacb0c323..a0e405a8e262cacc9a8f0ab38d7282f264073122 100644 (file)
--- a/utils/wxPython/src/gtk/gdi.py
+++ b/utils/wxPython/src/gtk/gdi.py
@@ -6,56 +6,52 @@ class wxBitmapPtr :
     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,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxBitmap(self.this)
-    def GetDepth(self):
-        val = gdic.wxBitmap_GetDepth(self.this)
+            gdic.delete_wxBitmap(self)
+    def GetPalette(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs)
+        if val: val = wxPalettePtr(val) 

         return val
         return val

-    def GetHeight(self):
-        val = gdic.wxBitmap_GetHeight(self.this)
+    def GetMask(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetMask,(self,) + _args, _kwargs)
+        if val: val = wxMaskPtr(val) 

         return val
         return val

-    def GetPalette(self):
-        val = gdic.wxBitmap_GetPalette(self.this)
-        val = wxPalettePtr(val)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def GetMask(self):
-        val = gdic.wxBitmap_GetMask(self.this)
-        val = wxMaskPtr(val)
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SaveFile,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = gdic.wxBitmap_GetWidth(self.this)
+    def SetMask(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetMask,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFile(self,arg0,arg1):
-        val = gdic.wxBitmap_LoadFile(self.this,arg0,arg1)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxBitmap_Ok(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SaveFile(self,arg0,arg1,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxBitmap_SaveFile,(self.this,arg0,arg1,)+args)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDepth(self,arg0):
-        val = gdic.wxBitmap_SetDepth(self.this,arg0)
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_GetDepth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHeight(self,arg0):
-        val = gdic.wxBitmap_SetHeight(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMask(self,arg0):
-        val = gdic.wxBitmap_SetMask(self.this,arg0.this)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = gdic.wxBitmap_SetWidth(self.this,arg0)
+    def SetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxBitmap_SetDepth,(self,) + _args, _kwargs)

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

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

 class wxBitmap(wxBitmapPtr):
 class wxBitmap(wxBitmapPtr):

-    def __init__(self,arg0,arg1) :
-        self.this = gdic.new_wxBitmap(arg0,arg1)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBitmap,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -65,71 +61,69 @@ class wxMaskPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self):
-        if self.thisown == 1 :
-            gdic.delete_wxMask(self.this)

     def __repr__(self):
     def __repr__(self):

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

 class wxMask(wxMaskPtr):
 class wxMask(wxMaskPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxMask(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxMask,_args,_kwargs)

         self.thisown = 1
 
 
 
 
         self.thisown = 1
 
 
 
 

-class wxIconPtr(wxBitmapPtr):
+class wxIconPtr :

     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,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxIcon(self.this)
-    def GetDepth(self):
-        val = gdic.wxIcon_GetDepth(self.this)
+            gdic.delete_wxIcon(self)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def GetHeight(self):
-        val = gdic.wxIcon_GetHeight(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = gdic.wxIcon_GetWidth(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def LoadFile(self,arg0,arg1):
-        val = gdic.wxIcon_LoadFile(self.this,arg0,arg1)
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxIcon_Ok(self.this)
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDepth(self,arg0):
-        val = gdic.wxIcon_SetDepth(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetHeight(self,arg0):
-        val = gdic.wxIcon_SetHeight(self.this,arg0)
+    def SetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = gdic.wxIcon_SetWidth(self.this,arg0)
+    def SetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxIcon_SetDepth,(self,) + _args, _kwargs)

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

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

 class wxIcon(wxIconPtr):
 class wxIcon(wxIconPtr):

-    def __init__(self,this):
-        self.this = this
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxIcon,_args,_kwargs)
+        self.thisown = 1

 
 
 
 
 
 
 
 

-class wxCursorPtr(wxBitmapPtr):
+class wxCursorPtr :

     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,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxCursor(self.this)
-    def Ok(self):
-        val = gdic.wxCursor_Ok(self.this)
+            gdic.delete_wxCursor(self)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs)

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

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

 class wxCursor(wxCursorPtr):
     def __init__(self,this):
         self.this = this
 class wxCursor(wxCursorPtr):
     def __init__(self,this):
         self.this = this


@@ -141,47 +135,65 @@ class wxFontPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetFaceName(self):
-        val = gdic.wxFont_GetFaceName(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_Ok,(self,) + _args, _kwargs)
+        return val
+    def GetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetFaceName,(self,) + _args, _kwargs)
+        return val
+    def GetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetFamily,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFamily(self):
-        val = gdic.wxFont_GetFamily(self.this)
+    def GetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetPointSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPointSize(self):
-        val = gdic.wxFont_GetPointSize(self.this)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStyle(self):
-        val = gdic.wxFont_GetStyle(self.this)
+    def GetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetUnderlined,(self,) + _args, _kwargs)

         return val
         return val

-    def GetUnderlined(self):
-        val = gdic.wxFont_GetUnderlined(self.this)
+    def GetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetWeight,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWeight(self):
-        val = gdic.wxFont_GetWeight(self.this)
+    def GetEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFaceName(self,arg0):
-        val = gdic.wxFont_SetFaceName(self.this,arg0)
+    def SetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetFaceName,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFamily(self,arg0):
-        val = gdic.wxFont_SetFamily(self.this,arg0)
+    def SetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetFamily,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPointSize(self,arg0):
-        val = gdic.wxFont_SetPointSize(self.this,arg0)
+    def SetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStyle(self,arg0):
-        val = gdic.wxFont_SetStyle(self.this,arg0)
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetUnderlined(self,arg0):
-        val = gdic.wxFont_SetUnderlined(self.this,arg0)
+    def SetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetUnderlined,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWeight(self,arg0):
-        val = gdic.wxFont_SetWeight(self.this,arg0)
+    def SetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetWeight,(self,) + _args, _kwargs)
+        return val
+    def SetEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetEncoding,(self,) + _args, _kwargs)
+        return val
+    def GetFamilyString(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs)
+        return val
+    def GetStyleString(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetStyleString,(self,) + _args, _kwargs)
+        return val
+    def GetWeightString(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetWeightString,(self,) + _args, _kwargs)

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

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

 class wxFont(wxFontPtr):
 class wxFont(wxFontPtr):

-    def __init__(self,arg0,arg1,arg2,arg3,*args) :
-        self.this = apply(gdic.new_wxFont,(arg0,arg1,arg2,arg3,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxFont,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -191,32 +203,35 @@ class wxColourPtr :
     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,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxColour(self.this)
-    def Red(self):
-        val = gdic.wxColour_Red(self.this)
+            gdic.delete_wxColour(self)
+    def Red(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs)

         return val
         return val

-    def Green(self):
-        val = gdic.wxColour_Green(self.this)
+    def Green(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Green,(self,) + _args, _kwargs)

         return val
         return val

-    def Blue(self):
-        val = gdic.wxColour_Blue(self.this)
+    def Blue(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Blue,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxColour_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def Set(self,arg0,arg1,arg2):
-        val = gdic.wxColour_Set(self.this,arg0,arg1,arg2)
+    def Set(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Set,(self,) + _args, _kwargs)

         return val
         return val

-    def Get(self):
-        val = gdic.wxColour_Get(self.this)
+    def Get(self, *_args, **_kwargs):
+        val = apply(gdic.wxColour_Get,(self,) + _args, _kwargs)

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

-        return "<C wxColour instance>"
+        return "<C wxColour instance at %s>" % (self.this,)
+    asTuple = Get
+    def __str__(self): return str(self.asTuple())
+    def __repr__(self): return str(self.asTuple())

 class wxColour(wxColourPtr):
 class wxColour(wxColourPtr):

-    def __init__(self,*args) :
-        self.this = apply(gdic.new_wxColour,()+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxColour,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -226,45 +241,51 @@ class wxPenPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetCap(self):
-        val = gdic.wxPen_GetCap(self.this)
+    def GetCap(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs)
+        return val
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def GetJoin(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetJoin,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColour(self):
-        val = gdic.wxPen_GetColour(self.this)
-        val = wxColourPtr(val)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def GetJoin(self):
-        val = gdic.wxPen_GetJoin(self.this)
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetStyle(self):
-        val = gdic.wxPen_GetStyle(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def GetWidth(self):
-        val = gdic.wxPen_GetWidth(self.this)
+    def SetCap(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetCap,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxPen_Ok(self.this)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetCap(self,arg0):
-        val = gdic.wxPen_SetCap(self.this,arg0)
+    def SetJoin(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetJoin,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = gdic.wxPen_SetColour(self.this,arg0.this)
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetJoin(self,arg0):
-        val = gdic.wxPen_SetJoin(self.this,arg0)
+    def SetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStyle(self,arg0):
-        val = gdic.wxPen_SetStyle(self.this,arg0)
+    def GetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWidth(self,arg0):
-        val = gdic.wxPen_SetWidth(self.this,arg0)
+    def SetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)

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

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

 class wxPen(wxPenPtr):
 class wxPen(wxPenPtr):

-    def __init__(self,arg0,*args) :
-        self.this = apply(gdic.new_wxPen,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPen,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -274,34 +295,34 @@ class wxBrushPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetColour(self):
-        val = gdic.wxBrush_GetColour(self.this)
-        val = wxColourPtr(val)
+    def GetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetStipple(self):
-        val = gdic.wxBrush_GetStipple(self.this)
-        val = wxBitmapPtr(val)
+    def GetStipple(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_GetStipple,(self,) + _args, _kwargs)
+        if val: val = wxBitmapPtr(val) 

         return val
         return val

-    def GetStyle(self):
-        val = gdic.wxBrush_GetStyle(self.this)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxBrush_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColour(self,arg0):
-        val = gdic.wxBrush_SetColour(self.this,arg0.this)
+    def SetColour(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_SetColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStipple(self,arg0):
-        val = gdic.wxBrush_SetStipple(self.this,arg0.this)
+    def SetStipple(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_SetStipple,(self,) + _args, _kwargs)

         return val
         return val

-    def SetStyle(self,arg0):
-        val = gdic.wxBrush_SetStyle(self.this,arg0)
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrush_SetStyle,(self,) + _args, _kwargs)

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

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

 class wxBrush(wxBrushPtr):
 class wxBrush(wxBrushPtr):

-    def __init__(self,arg0,*args) :
-        self.this = apply(gdic.new_wxBrush,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBrush,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -311,229 +332,267 @@ class wxDCPtr :
     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,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxDC(self.this)
-    def BeginDrawing(self):
-        val = gdic.wxDC_BeginDrawing(self.this)
+            gdic.delete_wxDC(self)
+    def BeginDrawing(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs)
+        return val
+    def Blit(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_Blit,(self,) + _args, _kwargs)
+        return val
+    def Clear(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_Clear,(self,) + _args, _kwargs)
+        return val
+    def CrossHair(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_CrossHair,(self,) + _args, _kwargs)
+        return val
+    def DestroyClippingRegion(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DestroyClippingRegion,(self,) + _args, _kwargs)
+        return val
+    def DeviceToLogicalX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalX,(self,) + _args, _kwargs)
+        return val
+    def DeviceToLogicalXRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalXRel,(self,) + _args, _kwargs)
+        return val
+    def DeviceToLogicalY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalY,(self,) + _args, _kwargs)
+        return val
+    def DeviceToLogicalYRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DeviceToLogicalYRel,(self,) + _args, _kwargs)
+        return val
+    def DrawArc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawArc,(self,) + _args, _kwargs)
+        return val
+    def DrawCircle(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawCircle,(self,) + _args, _kwargs)
+        return val
+    def DrawEllipse(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawEllipse,(self,) + _args, _kwargs)

         return val
         return val

-    def Blit(self,arg0,arg1,arg2,arg3,arg4,arg5,arg6,arg7):
-        val = gdic.wxDC_Blit(self.this,arg0,arg1,arg2,arg3,arg4.this,arg5,arg6,arg7)
+    def DrawEllipticArc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawEllipticArc,(self,) + _args, _kwargs)

         return val
         return val

-    def Clear(self):
-        val = gdic.wxDC_Clear(self.this)
+    def DrawIcon(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs)

         return val
         return val

-    def CrossHair(self,arg0,arg1):
-        val = gdic.wxDC_CrossHair(self.this,arg0,arg1)
+    def DrawLine(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs)

         return val
         return val

-    def DestroyClippingRegion(self):
-        val = gdic.wxDC_DestroyClippingRegion(self.this)
+    def DrawLines(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawLines,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalX(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalX(self.this,arg0)
+    def DrawPolygon(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawPolygon,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalXRel(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalXRel(self.this,arg0)
+    def DrawPoint(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalY(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalY(self.this,arg0)
+    def DrawRectangle(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawRectangle,(self,) + _args, _kwargs)

         return val
         return val

-    def DeviceToLogicalYRel(self,arg0):
-        val = gdic.wxDC_DeviceToLogicalYRel(self.this,arg0)
+    def DrawRotatedText(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawRotatedText,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawArc(self,arg0,arg1,arg2,arg3,arg4,arg5):
-        val = gdic.wxDC_DrawArc(self.this,arg0,arg1,arg2,arg3,arg4,arg5)
+    def DrawRoundedRectangle(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawRoundedRectangle,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawEllipse(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_DrawEllipse(self.this,arg0,arg1,arg2,arg3)
+    def DrawSpline(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawSpline,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawEllipticArc(self,arg0,arg1,arg2,arg3,arg4,arg5):
-        val = gdic.wxDC_DrawEllipticArc(self.this,arg0,arg1,arg2,arg3,arg4,arg5)
+    def DrawText(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawText,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawIcon(self,arg0,arg1,arg2):
-        val = gdic.wxDC_DrawIcon(self.this,arg0.this,arg1,arg2)
+    def EndDoc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_EndDoc,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawLine(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_DrawLine(self.this,arg0,arg1,arg2,arg3)
+    def EndDrawing(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_EndDrawing,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawLines(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxDC_DrawLines,(self.this,arg0,)+args)
+    def EndPage(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_EndPage,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawPolygon(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxDC_DrawPolygon,(self.this,arg0,)+args)
+    def FloodFill(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_FloodFill,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawPoint(self,arg0,arg1):
-        val = gdic.wxDC_DrawPoint(self.this,arg0,arg1)
+    def GetBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetBackground,(self,) + _args, _kwargs)
+        if val: val = wxBrushPtr(val) 

         return val
         return val

-    def DrawRectangle(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_DrawRectangle(self.this,arg0,arg1,arg2,arg3)
+    def GetBrush(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetBrush,(self,) + _args, _kwargs)
+        if val: val = wxBrushPtr(val) 

         return val
         return val

-    def DrawRoundedRectangle(self,arg0,arg1,arg2,arg3,*args):
-        val = apply(gdic.wxDC_DrawRoundedRectangle,(self.this,arg0,arg1,arg2,arg3,)+args)
+    def GetCharHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetCharHeight,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawSpline(self,arg0,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxDC_DrawSpline,(self.this,arg0,)+args)
+    def GetCharWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetCharWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawText(self,arg0,arg1,arg2):
-        val = gdic.wxDC_DrawText(self.this,arg0,arg1,arg2)
+    def GetClippingBox(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetClippingBox,(self,) + _args, _kwargs)

         return val
         return val

-    def EndDoc(self):
-        val = gdic.wxDC_EndDoc(self.this)
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 

         return val
         return val

-    def EndDrawing(self):
-        val = gdic.wxDC_EndDrawing(self.this)
+    def GetLogicalFunction(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs)

         return val
         return val

-    def EndPage(self):
-        val = gdic.wxDC_EndPage(self.this)
+    def GetLogicalScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetLogicalScale,(self,) + _args, _kwargs)

         return val
         return val

-    def FloodFill(self,arg0,arg1,arg2,*args):
-        val = apply(gdic.wxDC_FloodFill,(self.this,arg0,arg1,arg2.this,)+args)
+    def GetMapMode(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetMapMode,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBackground(self):
-        val = gdic.wxDC_GetBackground(self.this)
-        val = wxBrushPtr(val)
+    def GetOptimization(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetOptimization,(self,) + _args, _kwargs)

         return val
         return val

-    def GetBrush(self):
-        val = gdic.wxDC_GetBrush(self.this)
-        val = wxBrushPtr(val)
+    def GetPen(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetPen,(self,) + _args, _kwargs)
+        if val: val = wxPenPtr(val) 

         return val
         return val

-    def GetCharHeight(self):
-        val = gdic.wxDC_GetCharHeight(self.this)
+    def GetPixel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetPixel,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetCharWidth(self):
-        val = gdic.wxDC_GetCharWidth(self.this)
+    def GetSizeTuple(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetSizeTuple,(self,) + _args, _kwargs)

         return val
         return val

-    def GetClippingBox(self):
-        val = gdic.wxDC_GetClippingBox(self.this)
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetFont(self):
-        val = gdic.wxDC_GetFont(self.this)
-        val = wxFontPtr(val)
+    def GetSizeMM(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetSizeMM,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1

         return val
         return val

-    def GetLogicalFunction(self):
-        val = gdic.wxDC_GetLogicalFunction(self.this)
+    def GetTextBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetMapMode(self):
-        val = gdic.wxDC_GetMapMode(self.this)
+    def GetTextExtent(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetTextExtent,(self,) + _args, _kwargs)

         return val
         return val

-    def GetOptimization(self):
-        val = gdic.wxDC_GetOptimization(self.this)
+    def GetFullTextExtent(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetFullTextExtent,(self,) + _args, _kwargs)

         return val
         return val

-    def GetPen(self):
-        val = gdic.wxDC_GetPen(self.this)
-        val = wxPenPtr(val)
+    def GetTextForeground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 

         return val
         return val

-    def GetPixel(self,arg0,arg1):
-        val = gdic.wxDC_GetPixel(self.this,arg0,arg1)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def GetUserScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetUserScale,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSize(self):
-        val = gdic.wxDC_GetSize(self.this)
+    def LogicalToDeviceX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceX,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextBackground(self):
-        val = gdic.wxDC_GetTextBackground(self.this)
-        val = wxColourPtr(val)
+    def LogicalToDeviceXRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceXRel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextExtent(self,arg0):
-        val = gdic.wxDC_GetTextExtent(self.this,arg0)
+    def LogicalToDeviceY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceY,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTextForeground(self):
-        val = gdic.wxDC_GetTextForeground(self.this)
-        val = wxColourPtr(val)
+    def LogicalToDeviceYRel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_LogicalToDeviceYRel,(self,) + _args, _kwargs)

         return val
         return val

-    def LogicalToDeviceX(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceX(self.this,arg0)
+    def MaxX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MaxX,(self,) + _args, _kwargs)

         return val
         return val

-    def LogicalToDeviceXRel(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceXRel(self.this,arg0)
+    def MaxY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MaxY,(self,) + _args, _kwargs)

         return val
         return val

-    def LogicalToDeviceY(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceY(self.this,arg0)
+    def MinX(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MinX,(self,) + _args, _kwargs)

         return val
         return val

-    def LogicalToDeviceYRel(self,arg0):
-        val = gdic.wxDC_LogicalToDeviceYRel(self.this,arg0)
+    def MinY(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_MinY,(self,) + _args, _kwargs)

         return val
         return val

-    def MaxX(self):
-        val = gdic.wxDC_MaxX(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_Ok,(self,) + _args, _kwargs)

         return val
         return val

-    def MaxY(self):
-        val = gdic.wxDC_MaxY(self.this)
+    def SetDeviceOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetDeviceOrigin,(self,) + _args, _kwargs)

         return val
         return val

-    def MinX(self):
-        val = gdic.wxDC_MinX(self.this)
+    def SetBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetBackground,(self,) + _args, _kwargs)

         return val
         return val

-    def MinY(self):
-        val = gdic.wxDC_MinY(self.this)
+    def SetBackgroundMode(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetBackgroundMode,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxDC_Ok(self.this)
+    def SetClippingRegion(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetClippingRegion,(self,) + _args, _kwargs)

         return val
         return val

-    def SetDeviceOrigin(self,arg0,arg1):
-        val = gdic.wxDC_SetDeviceOrigin(self.this,arg0,arg1)
+    def SetPalette(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetPalette,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBackground(self,arg0):
-        val = gdic.wxDC_SetBackground(self.this,arg0.this)
+    def SetBrush(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetBrush,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBackgroundMode(self,arg0):
-        val = gdic.wxDC_SetBackgroundMode(self.this,arg0)
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetFont,(self,) + _args, _kwargs)

         return val
         return val

-    def SetClippingRegion(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxDC_SetClippingRegion(self.this,arg0,arg1,arg2,arg3)
+    def SetLogicalFunction(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetLogicalFunction,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPalette(self,arg0):
-        val = gdic.wxDC_SetPalette(self.this,arg0.this)
+    def SetLogicalScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetLogicalScale,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBrush(self,arg0):
-        val = gdic.wxDC_SetBrush(self.this,arg0.this)
+    def SetMapMode(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetMapMode,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFont(self,arg0):
-        val = gdic.wxDC_SetFont(self.this,arg0.this)
+    def SetOptimization(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetOptimization,(self,) + _args, _kwargs)

         return val
         return val

-    def SetLogicalFunction(self,arg0):
-        val = gdic.wxDC_SetLogicalFunction(self.this,arg0)
+    def SetPen(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetPen,(self,) + _args, _kwargs)

         return val
         return val

-    def SetMapMode(self,arg0):
-        val = gdic.wxDC_SetMapMode(self.this,arg0)
+    def SetTextBackground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetTextBackground,(self,) + _args, _kwargs)

         return val
         return val

-    def SetOptimization(self,arg0):
-        val = gdic.wxDC_SetOptimization(self.this,arg0)
+    def SetTextForeground(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetTextForeground,(self,) + _args, _kwargs)

         return val
         return val

-    def SetPen(self,arg0):
-        val = gdic.wxDC_SetPen(self.this,arg0.this)
+    def SetUserScale(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetUserScale,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTextBackground(self,arg0):
-        val = gdic.wxDC_SetTextBackground(self.this,arg0.this)
+    def StartDoc(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_StartDoc,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTextForeground(self,arg0):
-        val = gdic.wxDC_SetTextForeground(self.this,arg0.this)
+    def StartPage(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_StartPage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetUserScale(self,arg0,arg1):
-        val = gdic.wxDC_SetUserScale(self.this,arg0,arg1)
+    def DrawBitmap(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawBitmap,(self,) + _args, _kwargs)

         return val
         return val

-    def StartDoc(self,arg0):
-        val = gdic.wxDC_StartDoc(self.this,arg0)
+    def CanDrawBitmap(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_CanDrawBitmap,(self,) + _args, _kwargs)

         return val
         return val

-    def StartPage(self):
-        val = gdic.wxDC_StartPage(self.this)
+    def CanGetTextExtent(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_CanGetTextExtent,(self,) + _args, _kwargs)

         return val
         return val

-    def DrawBitmap(self,arg0,arg1,arg2,*args):
-        val = apply(gdic.wxDC_DrawBitmap,(self.this,arg0.this,arg1,arg2,)+args)
+    def GetDepth(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetDepth,(self,) + _args, _kwargs)
+        return val
+    def GetPPI(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetPPI,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def GetLogicalOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetLogicalOrigin,(self,) + _args, _kwargs)
+        return val
+    def SetLogicalOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetLogicalOrigin,(self,) + _args, _kwargs)
+        return val
+    def GetDeviceOrigin(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetDeviceOrigin,(self,) + _args, _kwargs)
+        return val
+    def SetAxisOrientation(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetAxisOrientation,(self,) + _args, _kwargs)

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

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

 class wxDC(wxDCPtr):
     def __init__(self,this):
         self.this = this
 class wxDC(wxDCPtr):
     def __init__(self,this):
         self.this = this


@@ -545,14 +604,14 @@ class wxMemoryDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SelectObject(self,arg0):
-        val = gdic.wxMemoryDC_SelectObject(self.this,arg0.this)
+    def SelectObject(self, *_args, **_kwargs):
+        val = apply(gdic.wxMemoryDC_SelectObject,(self,) + _args, _kwargs)

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

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

 class wxMemoryDC(wxMemoryDCPtr):
 class wxMemoryDC(wxMemoryDCPtr):

-    def __init__(self) :
-        self.this = gdic.new_wxMemoryDC()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxMemoryDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -562,24 +621,20 @@ class wxScreenDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def StartDrawingOnTop(self,arg0):
-        val = gdic.wxScreenDC_StartDrawingOnTop(self.this,arg0.this)
+    def StartDrawingOnTopWin(self, *_args, **_kwargs):
+        val = apply(gdic.wxScreenDC_StartDrawingOnTopWin,(self,) + _args, _kwargs)

         return val
         return val

-    def StartDrawingOnTopRect(self,*args):
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        val = apply(gdic.wxScreenDC_StartDrawingOnTopRect,(self.this,)+args)
+    def StartDrawingOnTop(self, *_args, **_kwargs):
+        val = apply(gdic.wxScreenDC_StartDrawingOnTop,(self,) + _args, _kwargs)

         return val
         return val

-    def EndDrawingOnTop(self):
-        val = gdic.wxScreenDC_EndDrawingOnTop(self.this)
+    def EndDrawingOnTop(self, *_args, **_kwargs):
+        val = apply(gdic.wxScreenDC_EndDrawingOnTop,(self,) + _args, _kwargs)

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

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

 class wxScreenDC(wxScreenDCPtr):
 class wxScreenDC(wxScreenDCPtr):

-    def __init__(self) :
-        self.this = gdic.new_wxScreenDC()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxScreenDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -590,10 +645,10 @@ class wxClientDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

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

 class wxClientDC(wxClientDCPtr):
 class wxClientDC(wxClientDCPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxClientDC(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxClientDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -604,10 +659,10 @@ class wxPaintDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

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

 class wxPaintDC(wxPaintDCPtr):
 class wxPaintDC(wxPaintDCPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxPaintDC(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPaintDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -618,10 +673,10 @@ class wxWindowDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

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

 class wxWindowDC(wxWindowDCPtr):
 class wxWindowDC(wxWindowDCPtr):

-    def __init__(self,arg0) :
-        self.this = gdic.new_wxWindowDC(arg0.this)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxWindowDC,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -632,14 +687,10 @@ class wxPostScriptDCPtr(wxDCPtr):
         self.this = this
         self.thisown = 0
     def __repr__(self):
         self.this = this
         self.thisown = 0
     def __repr__(self):

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

 class wxPostScriptDC(wxPostScriptDCPtr):
 class wxPostScriptDC(wxPostScriptDCPtr):

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

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -649,23 +700,58 @@ class wxPalettePtr :
     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,gdic=gdic):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            gdic.delete_wxPalette(self.this)
-    def GetPixel(self,arg0,arg1,arg2):
-        val = gdic.wxPalette_GetPixel(self.this,arg0,arg1,arg2)
+            gdic.delete_wxPalette(self)
+    def GetPixel(self, *_args, **_kwargs):
+        val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs)

         return val
         return val

-    def GetRGB(self,arg0,arg1,arg2,arg3):
-        val = gdic.wxPalette_GetRGB(self.this,arg0,arg1,arg2,arg3)
+    def GetRGB(self, *_args, **_kwargs):
+        val = apply(gdic.wxPalette_GetRGB,(self,) + _args, _kwargs)

         return val
         return val

-    def Ok(self):
-        val = gdic.wxPalette_Ok(self.this)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxPalette_Ok,(self,) + _args, _kwargs)

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

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

 class wxPalette(wxPalettePtr):
 class wxPalette(wxPalettePtr):

-    def __init__(self,arg0,arg1,arg2) :
-        self.this = gdic.new_wxPalette(arg0,arg1,arg2)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPalette,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxImageListPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,gdic=gdic):
+        if self.thisown == 1 :
+            gdic.delete_wxImageList(self)
+    def Add(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs)
+        return val
+    def Replace(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Replace,(self,) + _args, _kwargs)
+        return val
+    def Draw(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Draw,(self,) + _args, _kwargs)
+        return val
+    def GetImageCount(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_GetImageCount,(self,) + _args, _kwargs)
+        return val
+    def Remove(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_Remove,(self,) + _args, _kwargs)
+        return val
+    def RemoveAll(self, *_args, **_kwargs):
+        val = apply(gdic.wxImageList_RemoveAll,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxImageList instance at %s>" % (self.this,)
+class wxImageList(wxImageListPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxImageList,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -675,45 +761,68 @@ class wxPalette(wxPalettePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

-def wxEmptyBitmap(arg0,arg1,*args):
-    val = apply(gdic.wxEmptyBitmap,(arg0,arg1,)+args)
-    val = wxBitmapPtr(val)
-    val.thisown = 1
+def wxEmptyBitmap(*_args, **_kwargs):
+    val = apply(gdic.wxEmptyBitmap,_args,_kwargs)
+    if val: val = wxBitmapPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxNoRefBitmap(arg0,arg1):
-    val = gdic.wxNoRefBitmap(arg0,arg1)
-    val = wxBitmapPtr(val)
+def wxMaskColour(*_args, **_kwargs):
+    val = apply(gdic.wxMaskColour,_args,_kwargs)
+    if val: val = wxMaskPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxMaskColour(arg0,arg1):
-    val = gdic.wxMaskColour(arg0.this,arg1.this)
-    val = wxMaskPtr(val)
-    val.thisown = 1
+def wxStockCursor(*_args, **_kwargs):
+    val = apply(gdic.wxStockCursor,_args,_kwargs)
+    if val: val = wxCursorPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxStockCursor(arg0):
-    val = gdic.wxStockCursor(arg0)
-    val = wxCursorPtr(val)
-    val.thisown = 1
-    return val
+wxFont_GetDefaultEncoding = gdic.wxFont_GetDefaultEncoding
+
+wxFont_SetDefaultEncoding = gdic.wxFont_SetDefaultEncoding

 
 

-def wxNamedColour(arg0):
-    val = gdic.wxNamedColour(arg0)
-    val = wxColourPtr(val)
-    val.thisown = 1
+def wxNamedColour(*_args, **_kwargs):
+    val = apply(gdic.wxNamedColour,_args,_kwargs)
+    if val: val = wxColourPtr(val); val.thisown = 1

     return val
 
     return val
 

-def wxMemoryDCFromDC(arg0):
-    val = gdic.wxMemoryDCFromDC(arg0.this)
-    val = wxMemoryDCPtr(val)
-    val.thisown = 1
+def wxMemoryDCFromDC(*_args, **_kwargs):
+    val = apply(gdic.wxMemoryDCFromDC,_args,_kwargs)
+    if val: val = wxMemoryDCPtr(val); val.thisown = 1

     return val
 
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
     return val
 
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

+wxFONTENCODING_SYSTEM = gdic.wxFONTENCODING_SYSTEM
+wxFONTENCODING_DEFAULT = gdic.wxFONTENCODING_DEFAULT
+wxFONTENCODING_ISO8859_1 = gdic.wxFONTENCODING_ISO8859_1
+wxFONTENCODING_ISO8859_2 = gdic.wxFONTENCODING_ISO8859_2
+wxFONTENCODING_ISO8859_3 = gdic.wxFONTENCODING_ISO8859_3
+wxFONTENCODING_ISO8859_4 = gdic.wxFONTENCODING_ISO8859_4
+wxFONTENCODING_ISO8859_5 = gdic.wxFONTENCODING_ISO8859_5
+wxFONTENCODING_ISO8859_6 = gdic.wxFONTENCODING_ISO8859_6
+wxFONTENCODING_ISO8859_7 = gdic.wxFONTENCODING_ISO8859_7
+wxFONTENCODING_ISO8859_8 = gdic.wxFONTENCODING_ISO8859_8
+wxFONTENCODING_ISO8859_9 = gdic.wxFONTENCODING_ISO8859_9
+wxFONTENCODING_ISO8859_10 = gdic.wxFONTENCODING_ISO8859_10
+wxFONTENCODING_ISO8859_11 = gdic.wxFONTENCODING_ISO8859_11
+wxFONTENCODING_ISO8859_12 = gdic.wxFONTENCODING_ISO8859_12
+wxFONTENCODING_ISO8859_13 = gdic.wxFONTENCODING_ISO8859_13
+wxFONTENCODING_ISO8859_14 = gdic.wxFONTENCODING_ISO8859_14
+wxFONTENCODING_ISO8859_15 = gdic.wxFONTENCODING_ISO8859_15
+wxFONTENCODING_KOI8 = gdic.wxFONTENCODING_KOI8
+wxFONTENCODING_ALTERNATIVE = gdic.wxFONTENCODING_ALTERNATIVE
+wxFONTENCODING_BULGARIAN = gdic.wxFONTENCODING_BULGARIAN
+wxFONTENCODING_CP437 = gdic.wxFONTENCODING_CP437
+wxFONTENCODING_CP850 = gdic.wxFONTENCODING_CP850
+wxFONTENCODING_CP852 = gdic.wxFONTENCODING_CP852
+wxFONTENCODING_CP855 = gdic.wxFONTENCODING_CP855
+wxFONTENCODING_CP866 = gdic.wxFONTENCODING_CP866
+wxFONTENCODING_CP1250 = gdic.wxFONTENCODING_CP1250
+wxFONTENCODING_CP1251 = gdic.wxFONTENCODING_CP1251
+wxFONTENCODING_CP1252 = gdic.wxFONTENCODING_CP1252
+wxFONTENCODING_MAX = gdic.wxFONTENCODING_MAX

 cvar = gdic.cvar
 wxNORMAL_FONT = wxFontPtr(gdic.cvar.wxNORMAL_FONT)
 wxSMALL_FONT = wxFontPtr(gdic.cvar.wxSMALL_FONT)
 cvar = gdic.cvar
 wxNORMAL_FONT = wxFontPtr(gdic.cvar.wxNORMAL_FONT)
 wxSMALL_FONT = wxFontPtr(gdic.cvar.wxSMALL_FONT)


@@ -754,5 +863,13 @@ wxNullIcon = wxIconPtr(gdic.cvar.wxNullIcon)
 wxNullCursor = wxCursorPtr(gdic.cvar.wxNullCursor)
 wxNullPen = wxPenPtr(gdic.cvar.wxNullPen)
 wxNullBrush = wxBrushPtr(gdic.cvar.wxNullBrush)
 wxNullCursor = wxCursorPtr(gdic.cvar.wxNullCursor)
 wxNullPen = wxPenPtr(gdic.cvar.wxNullPen)
 wxNullBrush = wxBrushPtr(gdic.cvar.wxNullBrush)

+wxNullPalette = wxPalettePtr(gdic.cvar.wxNullPalette)

 wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
 wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)
 wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
 wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)

+wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
+wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
+wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED
+wxIMAGELIST_DRAW_FOCUSED = gdic.wxIMAGELIST_DRAW_FOCUSED
+wxIMAGE_LIST_NORMAL = gdic.wxIMAGE_LIST_NORMAL
+wxIMAGE_LIST_SMALL = gdic.wxIMAGE_LIST_SMALL
+wxIMAGE_LIST_STATE = gdic.wxIMAGE_LIST_STATE