changes for wxMSW compilation

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

diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index 7b6d5f792e457ce3f2ad44349c1d7732cc59040d..868a28711664a5d089a1a16fcf71160510e24679 100644 (file)
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -20,6 +20,7 @@ class wxBitmapPtr :
         return val
     def GetPalette(self):
         val = gdic.wxBitmap_GetPalette(self.this)
+        val = wxPalettePtr(val)
         return val
     def GetMask(self):
         val = gdic.wxBitmap_GetMask(self.this)
@@ -35,6 +36,10 @@ class wxBitmapPtr :
         val = gdic.wxBitmap_Ok(self.this)
         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)
         return val
     def SetDepth(self,arg0):
@@ -47,7 +52,7 @@ class wxBitmapPtr :
         val = gdic.wxBitmap_SetMask(self.this,arg0.this)
         return val
     def SetPalette(self,arg0):
-        val = gdic.wxBitmap_SetPalette(self.this,arg0)
+        val = gdic.wxBitmap_SetPalette(self.this,arg0.this)
         return val
     def SetWidth(self,arg0):
         val = gdic.wxBitmap_SetWidth(self.this,arg0)
@@ -239,13 +244,6 @@ class wxPenPtr :
         val = gdic.wxPen_GetColour(self.this)
         val = wxColourPtr(val)
         return val
-    def GetDashes(self,arg0):
-        val = gdic.wxPen_GetDashes(self.this,arg0)
-        return val
-    def GetStipple(self):
-        val = gdic.wxPen_GetStipple(self.this)
-        val = wxBitmapPtr(val)
-        return val
     def GetJoin(self):
         val = gdic.wxPen_GetJoin(self.this)
         return val
@@ -264,12 +262,6 @@ class wxPenPtr :
     def SetColour(self,arg0):
         val = gdic.wxPen_SetColour(self.this,arg0.this)
         return val
-    def SetDashes(self,arg0,*args):
-        val = apply(gdic.wxPen_SetDashes,(self.this,arg0,)+args)
-        return val
-    def SetStipple(self,arg0):
-        val = gdic.wxPen_SetStipple(self.this,arg0.this)
-        return val
     def SetJoin(self,arg0):
         val = gdic.wxPen_SetJoin(self.this,arg0)
         return val
@@ -279,6 +271,19 @@ class wxPenPtr :
     def SetWidth(self,arg0):
         val = gdic.wxPen_SetWidth(self.this,arg0)
         return val
+    def GetDashes(self,arg0):
+        val = gdic.wxPen_GetDashes(self.this,arg0)
+        return val
+    def GetStipple(self):
+        val = gdic.wxPen_GetStipple(self.this)
+        val = wxBitmapPtr(val)
+        return val
+    def SetDashes(self,arg0,*args):
+        val = apply(gdic.wxPen_SetDashes,(self.this,arg0,)+args)
+        return val
+    def SetStipple(self,arg0):
+        val = gdic.wxPen_SetStipple(self.this,arg0.this)
+        return val
     def __repr__(self):
         return "<C wxPen instance>"
 class wxPen(wxPenPtr):
@@ -417,6 +422,9 @@ class wxDCPtr :
     def EndPage(self):
         val = gdic.wxDC_EndPage(self.this)
         return val
+    def FloodFill(self,arg0,arg1,arg2,*args):
+        val = apply(gdic.wxDC_FloodFill,(self.this,arg0,arg1,arg2.this,)+args)
+        return val
     def GetBackground(self):
         val = gdic.wxDC_GetBackground(self.this)
         val = wxBrushPtr(val)
@@ -510,7 +518,7 @@ class wxDCPtr :
         val = gdic.wxDC_SetClippingRegion(self.this,arg0,arg1,arg2,arg3)
         return val
     def SetPalette(self,arg0):
-        val = gdic.wxDC_SetPalette(self.this,arg0)
+        val = gdic.wxDC_SetPalette(self.this,arg0.this)
         return val
     def SetBrush(self,arg0):
         val = gdic.wxDC_SetBrush(self.this,arg0.this)
@@ -629,19 +637,15 @@ class wxPaintDC(wxPaintDCPtr):
 
 
 
-class wxPostScriptDCPtr(wxDCPtr):
+class wxWindowDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __repr__(self):
-        return "<C wxPostScriptDC instance>"
-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)
+        return "<C wxWindowDC instance>"
+class wxWindowDC(wxWindowDCPtr):
+    def __init__(self,arg0) :
+        self.this = gdic.new_wxWindowDC(arg0.this)
         self.thisown = 1
 
 
@@ -678,6 +682,32 @@ class wxMetaFileDC(wxMetaFileDCPtr):
 
 
 
+class wxPalettePtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            gdic.delete_wxPalette(self.this)
+    def GetPixel(self,arg0,arg1,arg2):
+        val = gdic.wxPalette_GetPixel(self.this,arg0,arg1,arg2)
+        return val
+    def GetRGB(self,arg0,arg1,arg2,arg3):
+        val = gdic.wxPalette_GetRGB(self.this,arg0,arg1,arg2,arg3)
+        return val
+    def Ok(self):
+        val = gdic.wxPalette_Ok(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxPalette instance>"
+class wxPalette(wxPalettePtr):
+    def __init__(self,arg0,arg1,arg2) :
+        self.this = gdic.new_wxPalette(arg0,arg1,arg2)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------