X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/059a841c9651ba15b1ecc7a8c35189a813a122eb..3e2125031b52b7ef6f809154fb20afced9e828f7:/wxPython/src/gtk/gdi.py diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 04dc027853..292e3e7a57 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -77,6 +77,9 @@ class wxBitmapPtr(wxGDIObjectPtr): val = apply(gdic.wxBitmap_GetSubBitmap,(self,) + _args, _kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val + def CopyFromIcon(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_CopyFromIcon,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) @@ -340,6 +343,9 @@ class wxFontListPtr(wxObjectPtr): def RemoveFont(self, *_args, **_kwargs): val = apply(gdic.wxFontList_RemoveFont,(self,) + _args, _kwargs) return val + def GetCount(self, *_args, **_kwargs): + val = apply(gdic.wxFontList_GetCount,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxFontList(wxFontListPtr): @@ -451,9 +457,6 @@ class wxPenPtr(wxGDIObjectPtr): def SetWidth(self, *_args, **_kwargs): val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs) return val - def GetDashes(self, *_args, **_kwargs): - val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs) - return val def SetDashes(self, *_args, **_kwargs): val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs) return val @@ -467,6 +470,26 @@ class wxPen(wxPenPtr): +class wxPyPenPtr(wxPenPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self,gdic=gdic): + if self.thisown == 1 : + gdic.delete_wxPyPen(self) + def SetDashes(self, *_args, **_kwargs): + val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxPyPen(wxPyPenPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(gdic.new_wxPyPen,_args,_kwargs) + self.thisown = 1 + + + + class wxPenListPtr(wxObjectPtr): def __init__(self,this): self.this = this @@ -481,6 +504,9 @@ class wxPenListPtr(wxObjectPtr): def RemovePen(self, *_args, **_kwargs): val = apply(gdic.wxPenList_RemovePen,(self,) + _args, _kwargs) return val + def GetCount(self, *_args, **_kwargs): + val = apply(gdic.wxPenList_GetCount,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxPenList(wxPenListPtr): @@ -530,7 +556,7 @@ class wxBrush(wxBrushPtr): -class wxBrushListPtr : +class wxBrushListPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -544,6 +570,9 @@ class wxBrushListPtr : def RemoveBrush(self, *_args, **_kwargs): val = apply(gdic.wxBrushList_RemoveBrush,(self,) + _args, _kwargs) return val + def GetCount(self, *_args, **_kwargs): + val = apply(gdic.wxBrushList_GetCount,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxBrushList(wxBrushListPtr): @@ -643,11 +672,11 @@ class wxDCPtr(wxObjectPtr): return val def GetBackground(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetBackground,(self,) + _args, _kwargs) - if val: val = wxBrushPtr(val) + if val: val = wxBrushPtr(val) ; val.thisown = 1 return val def GetBrush(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetBrush,(self,) + _args, _kwargs) - if val: val = wxBrushPtr(val) + if val: val = wxBrushPtr(val) ; val.thisown = 1 return val def GetCharHeight(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetCharHeight,(self,) + _args, _kwargs) @@ -660,7 +689,7 @@ class wxDCPtr(wxObjectPtr): return val def GetFont(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetFont,(self,) + _args, _kwargs) - if val: val = wxFontPtr(val) + if val: val = wxFontPtr(val) ; val.thisown = 1 return val def GetLogicalFunction(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs) @@ -676,7 +705,7 @@ class wxDCPtr(wxObjectPtr): return val def GetPen(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetPen,(self,) + _args, _kwargs) - if val: val = wxPenPtr(val) + if val: val = wxPenPtr(val) ; val.thisown = 1 return val def GetPixel(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetPixel,(self,) + _args, _kwargs) @@ -825,8 +854,36 @@ class wxDCPtr(wxObjectPtr): def ResetBoundingBox(self, *_args, **_kwargs): val = apply(gdic.wxDC_ResetBoundingBox,(self,) + _args, _kwargs) return val + def GetBoundingBox(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetBoundingBox,(self,) + _args, _kwargs) + return val + def _DrawPointList(self, *_args, **_kwargs): + val = apply(gdic.wxDC__DrawPointList,(self,) + _args, _kwargs) + return val + def _DrawLineList(self, *_args, **_kwargs): + val = apply(gdic.wxDC__DrawLineList,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) + + def DrawPointList(self, points, pens=None): + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(points): + raise ValueError('points and pens must have same length') + return self._DrawPointList(points, pens) + + def DrawLineList(self, lines, pens=None): + if pens is None: + pens = [] + elif isinstance(pens, wxPenPtr): + pens = [pens] + elif len(pens) != len(lines): + raise ValueError('lines and pens must have same length') + return self._DrawLineList(lines, pens) + class wxDC(wxDCPtr): def __init__(self,this): self.this = this @@ -916,20 +973,6 @@ class wxWindowDC(wxWindowDCPtr): -class wxPostScriptDCPtr(wxDCPtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def __repr__(self): - return "" % (self.this,) -class wxPostScriptDC(wxPostScriptDCPtr): - def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxPostScriptDC,_args,_kwargs) - self.thisown = 1 - - - - class wxPalettePtr(wxGDIObjectPtr): def __init__(self,this): self.this = this @@ -1234,6 +1277,10 @@ wxFONTENCODING_CP852 = gdic.wxFONTENCODING_CP852 wxFONTENCODING_CP855 = gdic.wxFONTENCODING_CP855 wxFONTENCODING_CP866 = gdic.wxFONTENCODING_CP866 wxFONTENCODING_CP874 = gdic.wxFONTENCODING_CP874 +wxFONTENCODING_CP932 = gdic.wxFONTENCODING_CP932 +wxFONTENCODING_CP936 = gdic.wxFONTENCODING_CP936 +wxFONTENCODING_CP949 = gdic.wxFONTENCODING_CP949 +wxFONTENCODING_CP950 = gdic.wxFONTENCODING_CP950 wxFONTENCODING_CP1250 = gdic.wxFONTENCODING_CP1250 wxFONTENCODING_CP1251 = gdic.wxFONTENCODING_CP1251 wxFONTENCODING_CP1252 = gdic.wxFONTENCODING_CP1252 @@ -1247,6 +1294,16 @@ wxFONTENCODING_UTF7 = gdic.wxFONTENCODING_UTF7 wxFONTENCODING_UTF8 = gdic.wxFONTENCODING_UTF8 wxFONTENCODING_UNICODE = gdic.wxFONTENCODING_UNICODE wxFONTENCODING_MAX = gdic.wxFONTENCODING_MAX +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 +wxOutRegion = gdic.wxOutRegion +wxPartRegion = gdic.wxPartRegion +wxInRegion = gdic.wxInRegion cvar = gdic.cvar wxNORMAL_FONT = wxFontPtr(gdic.cvar.wxNORMAL_FONT) wxSMALL_FONT = wxFontPtr(gdic.cvar.wxSMALL_FONT) @@ -1292,14 +1349,5 @@ wxNullFont = wxFontPtr(gdic.cvar.wxNullFont) wxNullColour = wxColourPtr(gdic.cvar.wxNullColour) wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList) wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList) +wxTheBrushList = wxBrushListPtr(gdic.cvar.wxTheBrushList) wxTheColourDatabase = wxColourDatabasePtr(gdic.cvar.wxTheColourDatabase) -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 -wxOutRegion = gdic.wxOutRegion -wxPartRegion = gdic.wxPartRegion -wxInRegion = gdic.wxInRegion