Solved wxMotif scrolling display problem; added wxImageModule;

[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 3a24275f915ad17ec4bc23168045e4c91a0ef63f..05e3e899e9722e0c6494cd0f9ef42edbacb0c323 100644 (file)
--- a/utils/wxPython/src/gtk/gdi.py
+++ b/utils/wxPython/src/gtk/gdi.py
@@ -17,6 +17,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)
@@ -32,6 +33,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):
@@ -142,9 +147,6 @@ class wxFontPtr :
     def GetFamily(self):
         val = gdic.wxFont_GetFamily(self.this)
         return val
-    def GetFontId(self):
-        val = gdic.wxFont_GetFontId(self.this)
-        return val
     def GetPointSize(self):
         val = gdic.wxFont_GetPointSize(self.this)
         return val
@@ -157,6 +159,24 @@ class wxFontPtr :
     def GetWeight(self):
         val = gdic.wxFont_GetWeight(self.this)
         return val
+    def SetFaceName(self,arg0):
+        val = gdic.wxFont_SetFaceName(self.this,arg0)
+        return val
+    def SetFamily(self,arg0):
+        val = gdic.wxFont_SetFamily(self.this,arg0)
+        return val
+    def SetPointSize(self,arg0):
+        val = gdic.wxFont_SetPointSize(self.this,arg0)
+        return val
+    def SetStyle(self,arg0):
+        val = gdic.wxFont_SetStyle(self.this,arg0)
+        return val
+    def SetUnderlined(self,arg0):
+        val = gdic.wxFont_SetUnderlined(self.this,arg0)
+        return val
+    def SetWeight(self,arg0):
+        val = gdic.wxFont_SetWeight(self.this,arg0)
+        return val
     def __repr__(self):
         return "<C wxFont instance>"
 class wxFont(wxFontPtr):
@@ -268,6 +288,15 @@ class wxBrushPtr :
     def Ok(self):
         val = gdic.wxBrush_Ok(self.this)
         return val
+    def SetColour(self,arg0):
+        val = gdic.wxBrush_SetColour(self.this,arg0.this)
+        return val
+    def SetStipple(self,arg0):
+        val = gdic.wxBrush_SetStipple(self.this,arg0.this)
+        return val
+    def SetStyle(self,arg0):
+        val = gdic.wxBrush_SetStyle(self.this,arg0)
+        return val
     def __repr__(self):
         return "<C wxBrush instance>"
 class wxBrush(wxBrushPtr):
@@ -465,7 +494,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)
@@ -584,6 +613,20 @@ class wxPaintDC(wxPaintDCPtr):
 
 
 
+class wxWindowDCPtr(wxDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxWindowDC instance>"
+class wxWindowDC(wxWindowDCPtr):
+    def __init__(self,arg0) :
+        self.this = gdic.new_wxWindowDC(arg0.this)
+        self.thisown = 1
+
+
+
+
 class wxPostScriptDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
@@ -602,6 +645,32 @@ class wxPostScriptDC(wxPostScriptDCPtr):
 
 
 
+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 ------------------