1. wxStaticLine implemented (generic (ugly) and MSW versions)

[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 840dfb0bf37153bf88eea858c9891fc3a10576d4..75790253bba0de8a07fb309cca708228528cd8d7 100644 (file)
--- a/utils/wxPython/src/gtk/gdi.py
+++ b/utils/wxPython/src/gtk/gdi.py
@@ -147,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
@@ -162,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):
@@ -273,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):
@@ -320,6 +344,9 @@ class wxDCPtr :
     def DrawArc(self,arg0,arg1,arg2,arg3,arg4,arg5):
         val = gdic.wxDC_DrawArc(self.this,arg0,arg1,arg2,arg3,arg4,arg5)
         return val
+    def DrawCircle(self,arg0,arg1,arg2):
+        val = gdic.wxDC_DrawCircle(self.this,arg0,arg1,arg2)
+        return val
     def DrawEllipse(self,arg0,arg1,arg2,arg3):
         val = gdic.wxDC_DrawEllipse(self.this,arg0,arg1,arg2,arg3)
         return val
@@ -380,12 +407,10 @@ class wxDCPtr :
     def GetBackground(self):
         val = gdic.wxDC_GetBackground(self.this)
         val = wxBrushPtr(val)
-        val.thisown = 1
         return val
     def GetBrush(self):
         val = gdic.wxDC_GetBrush(self.this)
         val = wxBrushPtr(val)
-        val.thisown = 1
         return val
     def GetCharHeight(self):
         val = gdic.wxDC_GetCharHeight(self.this)
@@ -399,7 +424,6 @@ class wxDCPtr :
     def GetFont(self):
         val = gdic.wxDC_GetFont(self.this)
         val = wxFontPtr(val)
-        val.thisown = 1
         return val
     def GetLogicalFunction(self):
         val = gdic.wxDC_GetLogicalFunction(self.this)
@@ -413,15 +437,19 @@ class wxDCPtr :
     def GetPen(self):
         val = gdic.wxDC_GetPen(self.this)
         val = wxPenPtr(val)
-        val.thisown = 1
         return val
     def GetPixel(self,arg0,arg1):
         val = gdic.wxDC_GetPixel(self.this,arg0,arg1)
         val = wxColourPtr(val)
         val.thisown = 1
         return val
+    def GetSizeTuple(self):
+        val = gdic.wxDC_GetSizeTuple(self.this)
+        return val
     def GetSize(self):
         val = gdic.wxDC_GetSize(self.this)
+        val = wxSizePtr(val)
+        val.thisown = 1
         return val
     def GetTextBackground(self):
         val = gdic.wxDC_GetTextBackground(self.this)
@@ -430,6 +458,13 @@ class wxDCPtr :
     def GetTextExtent(self,arg0):
         val = gdic.wxDC_GetTextExtent(self.this,arg0)
         return val
+    def GetFullTextExtent(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(gdic.wxDC_GetFullTextExtent,(self.this,arg0,)+args)
+        return val
     def GetTextForeground(self):
         val = gdic.wxDC_GetTextForeground(self.this)
         val = wxColourPtr(val)
@@ -593,6 +628,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
@@ -637,6 +686,41 @@ class wxPalette(wxPalettePtr):
 
 
 
+class wxImageListPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            gdic.delete_wxImageList(self.this)
+    def Add(self,arg0):
+        val = gdic.wxImageList_Add(self.this,arg0.this)
+        return val
+    def Replace(self,arg0,arg1):
+        val = gdic.wxImageList_Replace(self.this,arg0,arg1.this)
+        return val
+    def Draw(self,arg0,arg1,arg2,arg3,*args):
+        val = apply(gdic.wxImageList_Draw,(self.this,arg0,arg1.this,arg2,arg3,)+args)
+        return val
+    def GetImageCount(self):
+        val = gdic.wxImageList_GetImageCount(self.this)
+        return val
+    def Remove(self,arg0):
+        val = gdic.wxImageList_Remove(self.this,arg0)
+        return val
+    def RemoveAll(self):
+        val = gdic.wxImageList_RemoveAll(self.this)
+        return val
+    def __repr__(self):
+        return "<C wxImageList instance>"
+class wxImageList(wxImageListPtr):
+    def __init__(self,arg0,arg1,*args) :
+        self.this = apply(gdic.new_wxImageList,(arg0,arg1,)+args)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -720,5 +804,13 @@ wxNullIcon = wxIconPtr(gdic.cvar.wxNullIcon)
 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)
+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