X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6e5c4450a911ae75c2955e2f2277cd24b95ddbb..8d5eff606ae62a36ea2ccecc017a810081cdc22d:/wxPython/src/mac/gdi.py diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py index c94ed3a603..c6a77db34b 100644 --- a/wxPython/src/mac/gdi.py +++ b/wxPython/src/mac/gdi.py @@ -122,9 +122,6 @@ class wxIconPtr(wxGDIObjectPtr): def __del__(self,gdic=gdic): if self.thisown == 1 : gdic.delete_wxIcon(self) - def LoadFile(self, *_args, **_kwargs): - val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs) - return val def Ok(self, *_args, **_kwargs): val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs) return val @@ -190,6 +187,51 @@ class wxNativeFontInfoPtr : def __init__(self,this): self.this = this self.thisown = 0 + def Init(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_Init,(self,) + _args, _kwargs) + return val + def GetPointSize(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_GetPointSize,(self,) + _args, _kwargs) + return val + def GetStyle(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_GetStyle,(self,) + _args, _kwargs) + return val + def GetWeight(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_GetWeight,(self,) + _args, _kwargs) + return val + def GetUnderlined(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_GetUnderlined,(self,) + _args, _kwargs) + return val + def GetFaceName(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_GetFaceName,(self,) + _args, _kwargs) + return val + def GetFamily(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_GetFamily,(self,) + _args, _kwargs) + return val + def GetEncoding(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_GetEncoding,(self,) + _args, _kwargs) + return val + def SetPointSize(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_SetPointSize,(self,) + _args, _kwargs) + return val + def SetStyle(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_SetStyle,(self,) + _args, _kwargs) + return val + def SetWeight(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_SetWeight,(self,) + _args, _kwargs) + return val + def SetUnderlined(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_SetUnderlined,(self,) + _args, _kwargs) + return val + def SetFaceName(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_SetFaceName,(self,) + _args, _kwargs) + return val + def SetFamily(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_SetFamily,(self,) + _args, _kwargs) + return val + def SetEncoding(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_SetEncoding,(self,) + _args, _kwargs) + return val def FromString(self, *_args, **_kwargs): val = apply(gdic.wxNativeFontInfo_FromString,(self,) + _args, _kwargs) return val @@ -199,11 +241,18 @@ class wxNativeFontInfoPtr : def __str__(self, *_args, **_kwargs): val = apply(gdic.wxNativeFontInfo___str__,(self,) + _args, _kwargs) return val + def FromUserString(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_FromUserString,(self,) + _args, _kwargs) + return val + def ToUserString(self, *_args, **_kwargs): + val = apply(gdic.wxNativeFontInfo_ToUserString,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxNativeFontInfo(wxNativeFontInfoPtr): - def __init__(self,this): - self.this = this + def __init__(self,*_args,**_kwargs): + self.this = apply(gdic.new_wxNativeFontInfo,_args,_kwargs) + self.thisown = 1 @@ -277,10 +326,19 @@ class wxFontPtr(wxGDIObjectPtr): def GetEncoding(self, *_args, **_kwargs): val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs) return val + def IsFixedWidth(self, *_args, **_kwargs): + val = apply(gdic.wxFont_IsFixedWidth,(self,) + _args, _kwargs) + return val def GetNativeFontInfo(self, *_args, **_kwargs): val = apply(gdic.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs) if val: val = wxNativeFontInfoPtr(val) return val + def GetNativeFontInfoDesc(self, *_args, **_kwargs): + val = apply(gdic.wxFont_GetNativeFontInfoDesc,(self,) + _args, _kwargs) + return val + def GetNativeFontInfoUserDesc(self, *_args, **_kwargs): + val = apply(gdic.wxFont_GetNativeFontInfoUserDesc,(self,) + _args, _kwargs) + return val def SetPointSize(self, *_args, **_kwargs): val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs) return val @@ -305,6 +363,9 @@ class wxFontPtr(wxGDIObjectPtr): def SetNativeFontInfo(self, *_args, **_kwargs): val = apply(gdic.wxFont_SetNativeFontInfo,(self,) + _args, _kwargs) return val + def SetNativeFontInfoUserDesc(self, *_args, **_kwargs): + val = apply(gdic.wxFont_SetNativeFontInfoUserDesc,(self,) + _args, _kwargs) + return val def GetFamilyString(self, *_args, **_kwargs): val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs) return val @@ -343,6 +404,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): @@ -501,6 +565,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): @@ -564,6 +631,9 @@ class wxBrushListPtr(wxObjectPtr): 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): @@ -663,11 +733,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) @@ -680,7 +750,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) @@ -696,7 +766,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) @@ -1268,6 +1338,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 @@ -1281,6 +1355,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) @@ -1328,13 +1412,3 @@ 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