X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/105e45b9d02d7e9ed10923957ae1ce60c037273d..01b43e030249709cdd57d6e91fda23d26e773139:/utils/wxPython/src/gtk/gdi.py diff --git a/utils/wxPython/src/gtk/gdi.py b/utils/wxPython/src/gtk/gdi.py index 840dfb0bf3..724c81dd9a 100644 --- 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 "" 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 "" class wxBrush(wxBrushPtr): @@ -380,12 +404,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 +421,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,7 +434,6 @@ 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) @@ -430,6 +450,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 +620,20 @@ class wxPaintDC(wxPaintDCPtr): +class wxWindowDCPtr(wxDCPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" +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 +678,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 "" +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 +796,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