X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ea09579141e90ae6bad13f50c6e0f34958eda74..cc9efb9be731d6827981fb8ddacf60bf1382b31c:/utils/wxPython/src/msw/gdi.py

diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index 868a287116..c3c059266f 100644
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -368,6 +368,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
@@ -464,8 +467,13 @@ class wxDCPtr :
         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)
@@ -474,6 +482,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)
@@ -708,6 +723,58 @@ 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,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(gdic.wxImageList_Add,(self.this,arg0.this,)+args)
+        return val
+    def AddWithColourMask(self,arg0,arg1):
+        val = gdic.wxImageList_AddWithColourMask(self.this,arg0.this,arg1.this)
+        return val
+    def AddIcon(self,arg0):
+        val = gdic.wxImageList_AddIcon(self.this,arg0.this)
+        return val
+    def Replace(self,arg0,arg1,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(gdic.wxImageList_Replace,(self.this,arg0,arg1.this,)+args)
+        return val
+    def ReplaceIcon(self,arg0,arg1):
+        val = gdic.wxImageList_ReplaceIcon(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 ------------------
@@ -791,5 +858,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