X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f774befd17081958952ec0e8dd3a818a4407947..37f9912de423f0b41e51f0e93a68303fc5396a12:/wxPython/src/mac/gdi.py?ds=sidebyside diff --git a/wxPython/src/mac/gdi.py b/wxPython/src/mac/gdi.py index 86e3f1c231..99802424e6 100644 --- a/wxPython/src/mac/gdi.py +++ b/wxPython/src/mac/gdi.py @@ -79,9 +79,9 @@ class Colour(core.Object): """Set(unsigned char red, unsigned char green, unsigned char blue)""" return _gdi.Colour_Set(*args, **kwargs) - def SetRBG(*args, **kwargs): - """SetRBG(unsigned long colRGB)""" - return _gdi.Colour_SetRBG(*args, **kwargs) + def SetRGB(*args, **kwargs): + """SetRGB(unsigned long colRGB)""" + return _gdi.Colour_SetRGB(*args, **kwargs) def __eq__(*args, **kwargs): """__eq__(Colour colour) -> bool""" @@ -91,17 +91,20 @@ class Colour(core.Object): """__ne__(Colour colour) -> bool""" return _gdi.Colour___ne__(*args, **kwargs) + def InitFromName(*args, **kwargs): + """InitFromName(String colourName)""" + return _gdi.Colour_InitFromName(*args, **kwargs) + def Get(*args, **kwargs): """Get() -> PyObject""" return _gdi.Colour_Get(*args, **kwargs) asTuple = Get def __str__(self): return str(self.asTuple()) - def __repr__(self): return 'wxColour' + str(self.asTuple()) + def __repr__(self): return 'wx.Colour' + str(self.asTuple()) def __nonzero__(self): return self.Ok() - def __getinitargs__(self): return () - def __getstate__(self): return self.asTuple() - def __setstate__(self, state): self.Set(*state) + __safe_for_unpickling__ = True + def __reduce__(self): return (Colour, self.Get()) class ColourPtr(Colour): @@ -112,7 +115,7 @@ class ColourPtr(Colour): _gdi.Colour_swigregister(ColourPtr) def NamedColour(*args, **kwargs): - """NamedColour(wxString colorName) -> Colour""" + """NamedColour(String colorName) -> Colour""" val = _gdi.new_NamedColour(*args, **kwargs) val.thisown = 1 return val @@ -124,7 +127,8 @@ def ColourRGB(*args, **kwargs): return val Color = Colour -NamedColor = NamedColour +NamedColor = NamedColour +ColorRGB = ColourRGB class Palette(GDIObject): def __repr__(self): @@ -231,6 +235,10 @@ class Pen(GDIObject): """GetDashes() -> PyObject""" return _gdi.Pen_GetDashes(*args, **kwargs) + def __eq__(*args, **kwargs): + """__eq__(Pen pen) -> bool""" + return _gdi.Pen___eq__(*args, **kwargs) + def __nonzero__(self): return self.Ok() class PenPtr(Pen): @@ -343,7 +351,7 @@ class Bitmap(GDIObject): return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(wxString name, wxBitmapType type=BITMAP_TYPE_ANY) -> Bitmap + __init__(String name, int type=BITMAP_TYPE_ANY) -> Bitmap Loads a bitmap from a file. """ @@ -432,7 +440,7 @@ class Bitmap(GDIObject): def SaveFile(*args, **kwargs): """ - SaveFile(wxString name, wxBitmapType type, Palette palette=(wxPalette *) NULL) -> bool + SaveFile(String name, int type, Palette palette=(wxPalette *) NULL) -> bool Saves a bitmap in the named file. """ @@ -440,7 +448,7 @@ class Bitmap(GDIObject): def LoadFile(*args, **kwargs): """ - LoadFile(wxString name, wxBitmapType type) -> bool + LoadFile(String name, int type) -> bool Loads a bitmap from a file """ @@ -552,9 +560,10 @@ class Mask(core.Object): return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Bitmap bitmap) -> Mask + __init__(Bitmap bitmap, Colour colour=NullColour) -> Mask - Constructs a mask from a monochrome bitmap. + Constructs a mask from a bitmap and a colour in that bitmap that indicates + the transparent portions of the mask, by default BLACK is used. """ newobj = _gdi.new_Mask(*args, **kwargs) self.this = newobj.this @@ -568,22 +577,12 @@ class MaskPtr(Mask): self.__class__ = Mask _gdi.Mask_swigregister(MaskPtr) -def MaskColour(*args, **kwargs): - """ - MaskColour(Bitmap bitmap, Colour colour) -> Mask - - Constructs a mask from a bitmap and a colour in that bitmap that indicates the - background. - """ - val = _gdi.new_MaskColour(*args, **kwargs) - val.thisown = 1 - return val - +MaskColour = Mask class Icon(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(wxString name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon""" + """__init__(String name, int type, int desiredWidth=-1, int desiredHeight=-1) -> Icon""" newobj = _gdi.new_Icon(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -663,7 +662,7 @@ class IconLocation(object): def __repr__(self): return "<%s.%s; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(wxString filename=&wxPyEmptyString, int num=0) -> IconLocation""" + """__init__(String filename=&wxPyEmptyString, int num=0) -> IconLocation""" newobj = _gdi.new_IconLocation(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -680,11 +679,11 @@ class IconLocation(object): def __nonzero__(self): return self.Ok() def SetFileName(*args, **kwargs): - """SetFileName(wxString filename)""" + """SetFileName(String filename)""" return _gdi.IconLocation_SetFileName(*args, **kwargs) def GetFileName(*args, **kwargs): - """GetFileName() -> wxString""" + """GetFileName() -> String""" return _gdi.IconLocation_GetFileName(*args, **kwargs) def SetIndex(*args, **kwargs): @@ -723,7 +722,7 @@ class IconBundle(object): return _gdi.IconBundle_AddIcon(*args, **kwargs) def AddIconFromFile(*args, **kwargs): - """AddIconFromFile(wxString file, long type)""" + """AddIconFromFile(String file, long type)""" return _gdi.IconBundle_AddIconFromFile(*args, **kwargs) def GetIcon(*args, **kwargs): @@ -739,7 +738,7 @@ class IconBundlePtr(IconBundle): _gdi.IconBundle_swigregister(IconBundlePtr) def IconBundleFromFile(*args, **kwargs): - """IconBundleFromFile(wxString file, long type) -> IconBundle""" + """IconBundleFromFile(String file, long type) -> IconBundle""" val = _gdi.new_IconBundleFromFile(*args, **kwargs) val.thisown = 1 return val @@ -754,7 +753,7 @@ class Cursor(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(wxString cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -> Cursor""" + """__init__(String cursorName, long flags, int hotSpotX=0, int hotSpotY=0) -> Cursor""" newobj = _gdi.new_Cursor(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -824,19 +823,19 @@ class Region(GDIObject): return _gdi.Region_Clear(*args, **kwargs) def Contains(*args, **kwargs): - """Contains(int x, int y) -> wxRegionContain""" + """Contains(int x, int y) -> int""" return _gdi.Region_Contains(*args, **kwargs) def ContainsPoint(*args, **kwargs): - """ContainsPoint(Point pt) -> wxRegionContain""" + """ContainsPoint(Point pt) -> int""" return _gdi.Region_ContainsPoint(*args, **kwargs) def ContainsRect(*args, **kwargs): - """ContainsRect(Rect rect) -> wxRegionContain""" + """ContainsRect(Rect rect) -> int""" return _gdi.Region_ContainsRect(*args, **kwargs) def ContainsRectDim(*args, **kwargs): - """ContainsRectDim(int x, int y, int w, int h) -> wxRegionContain""" + """ContainsRectDim(int x, int y, int w, int h) -> int""" return _gdi.Region_ContainsRectDim(*args, **kwargs) def GetBox(*args, **kwargs): @@ -1066,6 +1065,48 @@ FONTENCODING_UTF16BE = _gdi.FONTENCODING_UTF16BE FONTENCODING_UTF16LE = _gdi.FONTENCODING_UTF16LE FONTENCODING_UTF32BE = _gdi.FONTENCODING_UTF32BE FONTENCODING_UTF32LE = _gdi.FONTENCODING_UTF32LE +FONTENCODING_MACROMAN = _gdi.FONTENCODING_MACROMAN +FONTENCODING_MACJAPANESE = _gdi.FONTENCODING_MACJAPANESE +FONTENCODING_MACCHINESETRAD = _gdi.FONTENCODING_MACCHINESETRAD +FONTENCODING_MACKOREAN = _gdi.FONTENCODING_MACKOREAN +FONTENCODING_MACARABIC = _gdi.FONTENCODING_MACARABIC +FONTENCODING_MACHEBREW = _gdi.FONTENCODING_MACHEBREW +FONTENCODING_MACGREEK = _gdi.FONTENCODING_MACGREEK +FONTENCODING_MACCYRILLIC = _gdi.FONTENCODING_MACCYRILLIC +FONTENCODING_MACDEVANAGARI = _gdi.FONTENCODING_MACDEVANAGARI +FONTENCODING_MACGURMUKHI = _gdi.FONTENCODING_MACGURMUKHI +FONTENCODING_MACGUJARATI = _gdi.FONTENCODING_MACGUJARATI +FONTENCODING_MACORIYA = _gdi.FONTENCODING_MACORIYA +FONTENCODING_MACBENGALI = _gdi.FONTENCODING_MACBENGALI +FONTENCODING_MACTAMIL = _gdi.FONTENCODING_MACTAMIL +FONTENCODING_MACTELUGU = _gdi.FONTENCODING_MACTELUGU +FONTENCODING_MACKANNADA = _gdi.FONTENCODING_MACKANNADA +FONTENCODING_MACMALAJALAM = _gdi.FONTENCODING_MACMALAJALAM +FONTENCODING_MACSINHALESE = _gdi.FONTENCODING_MACSINHALESE +FONTENCODING_MACBURMESE = _gdi.FONTENCODING_MACBURMESE +FONTENCODING_MACKHMER = _gdi.FONTENCODING_MACKHMER +FONTENCODING_MACTHAI = _gdi.FONTENCODING_MACTHAI +FONTENCODING_MACLAOTIAN = _gdi.FONTENCODING_MACLAOTIAN +FONTENCODING_MACGEORGIAN = _gdi.FONTENCODING_MACGEORGIAN +FONTENCODING_MACARMENIAN = _gdi.FONTENCODING_MACARMENIAN +FONTENCODING_MACCHINESESIMP = _gdi.FONTENCODING_MACCHINESESIMP +FONTENCODING_MACTIBETAN = _gdi.FONTENCODING_MACTIBETAN +FONTENCODING_MACMONGOLIAN = _gdi.FONTENCODING_MACMONGOLIAN +FONTENCODING_MACETHIOPIC = _gdi.FONTENCODING_MACETHIOPIC +FONTENCODING_MACCENTRALEUR = _gdi.FONTENCODING_MACCENTRALEUR +FONTENCODING_MACVIATNAMESE = _gdi.FONTENCODING_MACVIATNAMESE +FONTENCODING_MACARABICEXT = _gdi.FONTENCODING_MACARABICEXT +FONTENCODING_MACSYMBOL = _gdi.FONTENCODING_MACSYMBOL +FONTENCODING_MACDINGBATS = _gdi.FONTENCODING_MACDINGBATS +FONTENCODING_MACTURKISH = _gdi.FONTENCODING_MACTURKISH +FONTENCODING_MACCROATIAN = _gdi.FONTENCODING_MACCROATIAN +FONTENCODING_MACICELANDIC = _gdi.FONTENCODING_MACICELANDIC +FONTENCODING_MACROMANIAN = _gdi.FONTENCODING_MACROMANIAN +FONTENCODING_MACCELTIC = _gdi.FONTENCODING_MACCELTIC +FONTENCODING_MACGAELIC = _gdi.FONTENCODING_MACGAELIC +FONTENCODING_MACKEYBOARD = _gdi.FONTENCODING_MACKEYBOARD +FONTENCODING_MACMIN = _gdi.FONTENCODING_MACMIN +FONTENCODING_MACMAX = _gdi.FONTENCODING_MACMAX FONTENCODING_MAX = _gdi.FONTENCODING_MAX FONTENCODING_UTF16 = _gdi.FONTENCODING_UTF16 FONTENCODING_UTF32 = _gdi.FONTENCODING_UTF32 @@ -1103,11 +1144,11 @@ class NativeFontInfo(object): return _gdi.NativeFontInfo_GetPointSize(*args, **kwargs) def GetStyle(*args, **kwargs): - """GetStyle() -> wxFontStyle""" + """GetStyle() -> int""" return _gdi.NativeFontInfo_GetStyle(*args, **kwargs) def GetWeight(*args, **kwargs): - """GetWeight() -> wxFontWeight""" + """GetWeight() -> int""" return _gdi.NativeFontInfo_GetWeight(*args, **kwargs) def GetUnderlined(*args, **kwargs): @@ -1115,15 +1156,15 @@ class NativeFontInfo(object): return _gdi.NativeFontInfo_GetUnderlined(*args, **kwargs) def GetFaceName(*args, **kwargs): - """GetFaceName() -> wxString""" + """GetFaceName() -> String""" return _gdi.NativeFontInfo_GetFaceName(*args, **kwargs) def GetFamily(*args, **kwargs): - """GetFamily() -> wxFontFamily""" + """GetFamily() -> int""" return _gdi.NativeFontInfo_GetFamily(*args, **kwargs) def GetEncoding(*args, **kwargs): - """GetEncoding() -> wxFontEncoding""" + """GetEncoding() -> int""" return _gdi.NativeFontInfo_GetEncoding(*args, **kwargs) def SetPointSize(*args, **kwargs): @@ -1131,11 +1172,11 @@ class NativeFontInfo(object): return _gdi.NativeFontInfo_SetPointSize(*args, **kwargs) def SetStyle(*args, **kwargs): - """SetStyle(wxFontStyle style)""" + """SetStyle(int style)""" return _gdi.NativeFontInfo_SetStyle(*args, **kwargs) def SetWeight(*args, **kwargs): - """SetWeight(wxFontWeight weight)""" + """SetWeight(int weight)""" return _gdi.NativeFontInfo_SetWeight(*args, **kwargs) def SetUnderlined(*args, **kwargs): @@ -1143,35 +1184,35 @@ class NativeFontInfo(object): return _gdi.NativeFontInfo_SetUnderlined(*args, **kwargs) def SetFaceName(*args, **kwargs): - """SetFaceName(wxString facename)""" + """SetFaceName(String facename)""" return _gdi.NativeFontInfo_SetFaceName(*args, **kwargs) def SetFamily(*args, **kwargs): - """SetFamily(wxFontFamily family)""" + """SetFamily(int family)""" return _gdi.NativeFontInfo_SetFamily(*args, **kwargs) def SetEncoding(*args, **kwargs): - """SetEncoding(wxFontEncoding encoding)""" + """SetEncoding(int encoding)""" return _gdi.NativeFontInfo_SetEncoding(*args, **kwargs) def FromString(*args, **kwargs): - """FromString(wxString s) -> bool""" + """FromString(String s) -> bool""" return _gdi.NativeFontInfo_FromString(*args, **kwargs) def ToString(*args, **kwargs): - """ToString() -> wxString""" + """ToString() -> String""" return _gdi.NativeFontInfo_ToString(*args, **kwargs) def __str__(*args, **kwargs): - """__str__() -> wxString""" + """__str__() -> String""" return _gdi.NativeFontInfo___str__(*args, **kwargs) def FromUserString(*args, **kwargs): - """FromUserString(wxString s) -> bool""" + """FromUserString(String s) -> bool""" return _gdi.NativeFontInfo_FromUserString(*args, **kwargs) def ToUserString(*args, **kwargs): - """ToUserString() -> wxString""" + """ToUserString() -> String""" return _gdi.NativeFontInfo_ToUserString(*args, **kwargs) @@ -1200,11 +1241,11 @@ class NativeEncodingInfo(object): except: pass def FromString(*args, **kwargs): - """FromString(wxString s) -> bool""" + """FromString(String s) -> bool""" return _gdi.NativeEncodingInfo_FromString(*args, **kwargs) def ToString(*args, **kwargs): - """ToString() -> wxString""" + """ToString() -> String""" return _gdi.NativeEncodingInfo_ToString(*args, **kwargs) @@ -1217,7 +1258,7 @@ _gdi.NativeEncodingInfo_swigregister(NativeEncodingInfoPtr) def GetNativeFontEncoding(*args, **kwargs): - """GetNativeFontEncoding(wxFontEncoding encoding) -> NativeEncodingInfo""" + """GetNativeFontEncoding(int encoding) -> NativeEncodingInfo""" return _gdi.GetNativeFontEncoding(*args, **kwargs) def TestFontEncoding(*args, **kwargs): @@ -1241,61 +1282,58 @@ class FontMapper(object): except: pass def Get(*args, **kwargs): - """FontMapper.Get() -> FontMapper""" + """Get() -> FontMapper""" return _gdi.FontMapper_Get(*args, **kwargs) Get = staticmethod(Get) def Set(*args, **kwargs): - """FontMapper.Set(FontMapper mapper) -> FontMapper""" + """Set(FontMapper mapper) -> FontMapper""" return _gdi.FontMapper_Set(*args, **kwargs) Set = staticmethod(Set) def CharsetToEncoding(*args, **kwargs): - """CharsetToEncoding(wxString charset, bool interactive=True) -> wxFontEncoding""" + """CharsetToEncoding(String charset, bool interactive=True) -> int""" return _gdi.FontMapper_CharsetToEncoding(*args, **kwargs) def GetSupportedEncodingsCount(*args, **kwargs): - """FontMapper.GetSupportedEncodingsCount() -> size_t""" + """GetSupportedEncodingsCount() -> size_t""" return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs) GetSupportedEncodingsCount = staticmethod(GetSupportedEncodingsCount) def GetEncoding(*args, **kwargs): - """FontMapper.GetEncoding(size_t n) -> wxFontEncoding""" + """GetEncoding(size_t n) -> int""" return _gdi.FontMapper_GetEncoding(*args, **kwargs) GetEncoding = staticmethod(GetEncoding) def GetEncodingName(*args, **kwargs): - """FontMapper.GetEncodingName(wxFontEncoding encoding) -> wxString""" + """GetEncodingName(int encoding) -> String""" return _gdi.FontMapper_GetEncodingName(*args, **kwargs) GetEncodingName = staticmethod(GetEncodingName) def GetEncodingDescription(*args, **kwargs): - """FontMapper.GetEncodingDescription(wxFontEncoding encoding) -> wxString""" + """GetEncodingDescription(int encoding) -> String""" return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs) GetEncodingDescription = staticmethod(GetEncodingDescription) def SetConfig(*args, **kwargs): - """SetConfig(wxConfigBase config)""" + """SetConfig(ConfigBase config)""" return _gdi.FontMapper_SetConfig(*args, **kwargs) def SetConfigPath(*args, **kwargs): - """SetConfigPath(wxString prefix)""" + """SetConfigPath(String prefix)""" return _gdi.FontMapper_SetConfigPath(*args, **kwargs) def GetDefaultConfigPath(*args, **kwargs): - """FontMapper.GetDefaultConfigPath() -> wxString""" + """GetDefaultConfigPath() -> String""" return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs) GetDefaultConfigPath = staticmethod(GetDefaultConfigPath) def GetAltForEncoding(*args, **kwargs): - """ - GetAltForEncoding(wxFontEncoding encoding, wxString facename=wxPyEmptyString, - bool interactive=True) -> PyObject - """ + """GetAltForEncoding(int encoding, String facename=EmptyString, bool interactive=True) -> PyObject""" return _gdi.FontMapper_GetAltForEncoding(*args, **kwargs) def IsEncodingAvailable(*args, **kwargs): - """IsEncodingAvailable(wxFontEncoding encoding, wxString facename=wxPyEmptyString) -> bool""" + """IsEncodingAvailable(int encoding, String facename=EmptyString) -> bool""" return _gdi.FontMapper_IsEncodingAvailable(*args, **kwargs) def SetDialogParent(*args, **kwargs): @@ -1303,7 +1341,7 @@ class FontMapper(object): return _gdi.FontMapper_SetDialogParent(*args, **kwargs) def SetDialogTitle(*args, **kwargs): - """SetDialogTitle(wxString title)""" + """SetDialogTitle(String title)""" return _gdi.FontMapper_SetDialogTitle(*args, **kwargs) @@ -1327,19 +1365,19 @@ def FontMapper_GetSupportedEncodingsCount(*args, **kwargs): return _gdi.FontMapper_GetSupportedEncodingsCount(*args, **kwargs) def FontMapper_GetEncoding(*args, **kwargs): - """FontMapper_GetEncoding(size_t n) -> wxFontEncoding""" + """FontMapper_GetEncoding(size_t n) -> int""" return _gdi.FontMapper_GetEncoding(*args, **kwargs) def FontMapper_GetEncodingName(*args, **kwargs): - """FontMapper_GetEncodingName(wxFontEncoding encoding) -> wxString""" + """FontMapper_GetEncodingName(int encoding) -> String""" return _gdi.FontMapper_GetEncodingName(*args, **kwargs) def FontMapper_GetEncodingDescription(*args, **kwargs): - """FontMapper_GetEncodingDescription(wxFontEncoding encoding) -> wxString""" + """FontMapper_GetEncodingDescription(int encoding) -> String""" return _gdi.FontMapper_GetEncodingDescription(*args, **kwargs) def FontMapper_GetDefaultConfigPath(*args, **kwargs): - """FontMapper_GetDefaultConfigPath() -> wxString""" + """FontMapper_GetDefaultConfigPath() -> String""" return _gdi.FontMapper_GetDefaultConfigPath(*args, **kwargs) #--------------------------------------------------------------------------- @@ -1350,8 +1388,8 @@ class Font(GDIObject): def __init__(self, *args, **kwargs): """ __init__(int pointSize, int family, int style, int weight, bool underline=False, - wxString face=wxPyEmptyString, - wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font + String face=EmptyString, + int encoding=FONTENCODING_DEFAULT) -> Font """ newobj = _gdi.new_Font(*args, **kwargs) self.this = newobj.this @@ -1397,11 +1435,11 @@ class Font(GDIObject): return _gdi.Font_GetUnderlined(*args, **kwargs) def GetFaceName(*args, **kwargs): - """GetFaceName() -> wxString""" + """GetFaceName() -> String""" return _gdi.Font_GetFaceName(*args, **kwargs) def GetEncoding(*args, **kwargs): - """GetEncoding() -> wxFontEncoding""" + """GetEncoding() -> int""" return _gdi.Font_GetEncoding(*args, **kwargs) def GetNativeFontInfo(*args, **kwargs): @@ -1413,11 +1451,11 @@ class Font(GDIObject): return _gdi.Font_IsFixedWidth(*args, **kwargs) def GetNativeFontInfoDesc(*args, **kwargs): - """GetNativeFontInfoDesc() -> wxString""" + """GetNativeFontInfoDesc() -> String""" return _gdi.Font_GetNativeFontInfoDesc(*args, **kwargs) def GetNativeFontInfoUserDesc(*args, **kwargs): - """GetNativeFontInfoUserDesc() -> wxString""" + """GetNativeFontInfoUserDesc() -> String""" return _gdi.Font_GetNativeFontInfoUserDesc(*args, **kwargs) def SetPointSize(*args, **kwargs): @@ -1437,7 +1475,7 @@ class Font(GDIObject): return _gdi.Font_SetWeight(*args, **kwargs) def SetFaceName(*args, **kwargs): - """SetFaceName(wxString faceName)""" + """SetFaceName(String faceName)""" return _gdi.Font_SetFaceName(*args, **kwargs) def SetUnderlined(*args, **kwargs): @@ -1445,7 +1483,7 @@ class Font(GDIObject): return _gdi.Font_SetUnderlined(*args, **kwargs) def SetEncoding(*args, **kwargs): - """SetEncoding(wxFontEncoding encoding)""" + """SetEncoding(int encoding)""" return _gdi.Font_SetEncoding(*args, **kwargs) def SetNativeFontInfo(*args, **kwargs): @@ -1453,23 +1491,23 @@ class Font(GDIObject): return _gdi.Font_SetNativeFontInfo(*args, **kwargs) def SetNativeFontInfoFromString(*args, **kwargs): - """SetNativeFontInfoFromString(wxString info)""" + """SetNativeFontInfoFromString(String info)""" return _gdi.Font_SetNativeFontInfoFromString(*args, **kwargs) def SetNativeFontInfoUserDesc(*args, **kwargs): - """SetNativeFontInfoUserDesc(wxString info)""" + """SetNativeFontInfoUserDesc(String info)""" return _gdi.Font_SetNativeFontInfoUserDesc(*args, **kwargs) def GetFamilyString(*args, **kwargs): - """GetFamilyString() -> wxString""" + """GetFamilyString() -> String""" return _gdi.Font_GetFamilyString(*args, **kwargs) def GetStyleString(*args, **kwargs): - """GetStyleString() -> wxString""" + """GetStyleString() -> String""" return _gdi.Font_GetStyleString(*args, **kwargs) def GetWeightString(*args, **kwargs): - """GetWeightString() -> wxString""" + """GetWeightString() -> String""" return _gdi.Font_GetWeightString(*args, **kwargs) def SetNoAntiAliasing(*args, **kwargs): @@ -1481,12 +1519,12 @@ class Font(GDIObject): return _gdi.Font_GetNoAntiAliasing(*args, **kwargs) def GetDefaultEncoding(*args, **kwargs): - """Font.GetDefaultEncoding() -> wxFontEncoding""" + """GetDefaultEncoding() -> int""" return _gdi.Font_GetDefaultEncoding(*args, **kwargs) GetDefaultEncoding = staticmethod(GetDefaultEncoding) def SetDefaultEncoding(*args, **kwargs): - """Font.SetDefaultEncoding(wxFontEncoding encoding)""" + """SetDefaultEncoding(int encoding)""" return _gdi.Font_SetDefaultEncoding(*args, **kwargs) SetDefaultEncoding = staticmethod(SetDefaultEncoding) @@ -1505,26 +1543,26 @@ def FontFromNativeInfo(*args, **kwargs): return val def FontFromNativeInfoString(*args, **kwargs): - """FontFromNativeInfoString(wxString info) -> Font""" + """FontFromNativeInfoString(String info) -> Font""" val = _gdi.new_FontFromNativeInfoString(*args, **kwargs) val.thisown = 1 return val def Font2(*args, **kwargs): """ - Font2(int pointSize, wxFontFamily family, int flags=FONTFLAG_DEFAULT, - wxString face=wxPyEmptyString, wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font + Font2(int pointSize, int family, int flags=FONTFLAG_DEFAULT, + String face=EmptyString, int encoding=FONTENCODING_DEFAULT) -> Font """ val = _gdi.new_Font2(*args, **kwargs) val.thisown = 1 return val def Font_GetDefaultEncoding(*args, **kwargs): - """Font_GetDefaultEncoding() -> wxFontEncoding""" + """Font_GetDefaultEncoding() -> int""" return _gdi.Font_GetDefaultEncoding(*args, **kwargs) def Font_SetDefaultEncoding(*args, **kwargs): - """Font_SetDefaultEncoding(wxFontEncoding encoding)""" + """Font_SetDefaultEncoding(int encoding)""" return _gdi.Font_SetDefaultEncoding(*args, **kwargs) #--------------------------------------------------------------------------- @@ -1551,11 +1589,11 @@ class FontEnumerator(object): return _gdi.FontEnumerator__setCallbackInfo(*args, **kwargs) def EnumerateFacenames(*args, **kwargs): - """EnumerateFacenames(wxFontEncoding encoding=FONTENCODING_SYSTEM, bool fixedWidthOnly=False) -> bool""" + """EnumerateFacenames(int encoding=FONTENCODING_SYSTEM, bool fixedWidthOnly=False) -> bool""" return _gdi.FontEnumerator_EnumerateFacenames(*args, **kwargs) def EnumerateEncodings(*args, **kwargs): - """EnumerateEncodings(wxString facename=wxPyEmptyString) -> bool""" + """EnumerateEncodings(String facename=EmptyString) -> bool""" return _gdi.FontEnumerator_EnumerateEncodings(*args, **kwargs) def GetEncodings(*args, **kwargs): @@ -1847,8 +1885,8 @@ class Locale(object): def Init1(*args, **kwargs): """ - Init1(wxString szName, wxString szShort=wxPyEmptyString, - wxString szLocale=wxPyEmptyString, bool bLoadDefault=True, + Init1(String szName, String szShort=EmptyString, String szLocale=EmptyString, + bool bLoadDefault=True, bool bConvertEncoding=False) -> bool """ return _gdi.Locale_Init1(*args, **kwargs) @@ -1865,17 +1903,17 @@ class Locale(object): return val def GetSystemLanguage(*args, **kwargs): - """Locale.GetSystemLanguage() -> int""" + """GetSystemLanguage() -> int""" return _gdi.Locale_GetSystemLanguage(*args, **kwargs) GetSystemLanguage = staticmethod(GetSystemLanguage) def GetSystemEncoding(*args, **kwargs): - """Locale.GetSystemEncoding() -> wxFontEncoding""" + """GetSystemEncoding() -> int""" return _gdi.Locale_GetSystemEncoding(*args, **kwargs) GetSystemEncoding = staticmethod(GetSystemEncoding) def GetSystemEncodingName(*args, **kwargs): - """Locale.GetSystemEncodingName() -> wxString""" + """GetSystemEncodingName() -> String""" return _gdi.Locale_GetSystemEncodingName(*args, **kwargs) GetSystemEncodingName = staticmethod(GetSystemEncodingName) @@ -1885,7 +1923,7 @@ class Locale(object): def __nonzero__(self): return self.IsOk() def GetLocale(*args, **kwargs): - """GetLocale() -> wxString""" + """GetLocale() -> String""" return _gdi.Locale_GetLocale(*args, **kwargs) def GetLanguage(*args, **kwargs): @@ -1893,52 +1931,52 @@ class Locale(object): return _gdi.Locale_GetLanguage(*args, **kwargs) def GetSysName(*args, **kwargs): - """GetSysName() -> wxString""" + """GetSysName() -> String""" return _gdi.Locale_GetSysName(*args, **kwargs) def GetCanonicalName(*args, **kwargs): - """GetCanonicalName() -> wxString""" + """GetCanonicalName() -> String""" return _gdi.Locale_GetCanonicalName(*args, **kwargs) def AddCatalogLookupPathPrefix(*args, **kwargs): - """Locale.AddCatalogLookupPathPrefix(wxString prefix)""" + """AddCatalogLookupPathPrefix(String prefix)""" return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs) AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix) def AddCatalog(*args, **kwargs): - """AddCatalog(wxString szDomain) -> bool""" + """AddCatalog(String szDomain) -> bool""" return _gdi.Locale_AddCatalog(*args, **kwargs) def IsLoaded(*args, **kwargs): - """IsLoaded(wxString szDomain) -> bool""" + """IsLoaded(String szDomain) -> bool""" return _gdi.Locale_IsLoaded(*args, **kwargs) def GetLanguageInfo(*args, **kwargs): - """Locale.GetLanguageInfo(int lang) -> LanguageInfo""" + """GetLanguageInfo(int lang) -> LanguageInfo""" return _gdi.Locale_GetLanguageInfo(*args, **kwargs) GetLanguageInfo = staticmethod(GetLanguageInfo) def GetLanguageName(*args, **kwargs): - """Locale.GetLanguageName(int lang) -> wxString""" + """GetLanguageName(int lang) -> String""" return _gdi.Locale_GetLanguageName(*args, **kwargs) GetLanguageName = staticmethod(GetLanguageName) def FindLanguageInfo(*args, **kwargs): - """Locale.FindLanguageInfo(wxString locale) -> LanguageInfo""" + """FindLanguageInfo(String locale) -> LanguageInfo""" return _gdi.Locale_FindLanguageInfo(*args, **kwargs) FindLanguageInfo = staticmethod(FindLanguageInfo) def AddLanguage(*args, **kwargs): - """Locale.AddLanguage(LanguageInfo info)""" + """AddLanguage(LanguageInfo info)""" return _gdi.Locale_AddLanguage(*args, **kwargs) AddLanguage = staticmethod(AddLanguage) def GetString(*args, **kwargs): - """GetString(wxString szOrigString, wxString szDomain=wxPyEmptyString) -> wxString""" + """GetString(String szOrigString, String szDomain=EmptyString) -> String""" return _gdi.Locale_GetString(*args, **kwargs) def GetName(*args, **kwargs): - """GetName() -> wxString""" + """GetName() -> String""" return _gdi.Locale_GetName(*args, **kwargs) @@ -1954,15 +1992,15 @@ def Locale_GetSystemLanguage(*args, **kwargs): return _gdi.Locale_GetSystemLanguage(*args, **kwargs) def Locale_GetSystemEncoding(*args, **kwargs): - """Locale_GetSystemEncoding() -> wxFontEncoding""" + """Locale_GetSystemEncoding() -> int""" return _gdi.Locale_GetSystemEncoding(*args, **kwargs) def Locale_GetSystemEncodingName(*args, **kwargs): - """Locale_GetSystemEncodingName() -> wxString""" + """Locale_GetSystemEncodingName() -> String""" return _gdi.Locale_GetSystemEncodingName(*args, **kwargs) def Locale_AddCatalogLookupPathPrefix(*args, **kwargs): - """Locale_AddCatalogLookupPathPrefix(wxString prefix)""" + """Locale_AddCatalogLookupPathPrefix(String prefix)""" return _gdi.Locale_AddCatalogLookupPathPrefix(*args, **kwargs) def Locale_GetLanguageInfo(*args, **kwargs): @@ -1970,11 +2008,11 @@ def Locale_GetLanguageInfo(*args, **kwargs): return _gdi.Locale_GetLanguageInfo(*args, **kwargs) def Locale_GetLanguageName(*args, **kwargs): - """Locale_GetLanguageName(int lang) -> wxString""" + """Locale_GetLanguageName(int lang) -> String""" return _gdi.Locale_GetLanguageName(*args, **kwargs) def Locale_FindLanguageInfo(*args, **kwargs): - """Locale_FindLanguageInfo(wxString locale) -> LanguageInfo""" + """Locale_FindLanguageInfo(String locale) -> LanguageInfo""" return _gdi.Locale_FindLanguageInfo(*args, **kwargs) def Locale_AddLanguage(*args, **kwargs): @@ -2010,28 +2048,25 @@ class EncodingConverter(core.Object): except: pass def Init(*args, **kwargs): - """ - Init(wxFontEncoding input_enc, wxFontEncoding output_enc, - int method=CONVERT_STRICT) -> bool - """ + """Init(int input_enc, int output_enc, int method=CONVERT_STRICT) -> bool""" return _gdi.EncodingConverter_Init(*args, **kwargs) def Convert(*args, **kwargs): - """Convert(wxString input) -> wxString""" + """Convert(String input) -> String""" return _gdi.EncodingConverter_Convert(*args, **kwargs) def GetPlatformEquivalents(*args, **kwargs): - """EncodingConverter.GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray""" + """GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray""" return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs) GetPlatformEquivalents = staticmethod(GetPlatformEquivalents) def GetAllEquivalents(*args, **kwargs): - """EncodingConverter.GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray""" + """GetAllEquivalents(int enc) -> wxFontEncodingArray""" return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs) GetAllEquivalents = staticmethod(GetAllEquivalents) def CanConvert(*args, **kwargs): - """EncodingConverter.CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool""" + """CanConvert(int encIn, int encOut) -> bool""" return _gdi.EncodingConverter_CanConvert(*args, **kwargs) CanConvert = staticmethod(CanConvert) @@ -2046,21 +2081,21 @@ _gdi.EncodingConverter_swigregister(EncodingConverterPtr) def GetTranslation(*args): """ - GetTranslation(wxString sz) -> wxString - GetTranslation(wxString sz1, wxString sz2, size_t n) -> wxString + GetTranslation(String str) -> String + GetTranslation(String str, String strPlural, size_t n) -> String """ return _gdi.GetTranslation(*args) def EncodingConverter_GetPlatformEquivalents(*args, **kwargs): - """EncodingConverter_GetPlatformEquivalents(wxFontEncoding enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray""" + """EncodingConverter_GetPlatformEquivalents(int enc, int platform=PLATFORM_CURRENT) -> wxFontEncodingArray""" return _gdi.EncodingConverter_GetPlatformEquivalents(*args, **kwargs) def EncodingConverter_GetAllEquivalents(*args, **kwargs): - """EncodingConverter_GetAllEquivalents(wxFontEncoding enc) -> wxFontEncodingArray""" + """EncodingConverter_GetAllEquivalents(int enc) -> wxFontEncodingArray""" return _gdi.EncodingConverter_GetAllEquivalents(*args, **kwargs) def EncodingConverter_CanConvert(*args, **kwargs): - """EncodingConverter_CanConvert(wxFontEncoding encIn, wxFontEncoding encOut) -> bool""" + """EncodingConverter_CanConvert(int encIn, int encOut) -> bool""" return _gdi.EncodingConverter_CanConvert(*args, **kwargs) #---------------------------------------------------------------------------- @@ -2228,19 +2263,19 @@ class DC(core.Object): return _gdi.DC_DrawBitmap(*args, **kwargs) def DrawTextXY(*args, **kwargs): - """DrawTextXY(wxString text, int x, int y)""" + """DrawTextXY(String text, int x, int y)""" return _gdi.DC_DrawTextXY(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(wxString text, Point pt)""" + """DrawText(String text, Point pt)""" return _gdi.DC_DrawText(*args, **kwargs) def DrawRotatedTextXY(*args, **kwargs): - """DrawRotatedTextXY(wxString text, int x, int y, double angle)""" + """DrawRotatedTextXY(String text, int x, int y, double angle)""" return _gdi.DC_DrawRotatedTextXY(*args, **kwargs) def DrawRotatedText(*args, **kwargs): - """DrawRotatedText(wxString text, Point pt, double angle)""" + """DrawRotatedText(String text, Point pt, double angle)""" return _gdi.DC_DrawRotatedText(*args, **kwargs) def BlitXY(*args, **kwargs): @@ -2271,14 +2306,14 @@ class DC(core.Object): def DrawLabel(*args, **kwargs): """ - DrawLabel(wxString text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, + DrawLabel(String text, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, int indexAccel=-1) """ return _gdi.DC_DrawLabel(*args, **kwargs) def DrawImageLabel(*args, **kwargs): """ - DrawImageLabel(wxString text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, + DrawImageLabel(String text, Bitmap image, Rect rect, int alignment=wxALIGN_LEFT|wxALIGN_TOP, int indexAccel=-1) -> Rect """ return _gdi.DC_DrawImageLabel(*args, **kwargs) @@ -2292,7 +2327,7 @@ class DC(core.Object): return _gdi.DC_Clear(*args, **kwargs) def StartDoc(*args, **kwargs): - """StartDoc(wxString message) -> bool""" + """StartDoc(String message) -> bool""" return _gdi.DC_StartDoc(*args, **kwargs) def EndDoc(*args, **kwargs): @@ -2396,6 +2431,10 @@ class DC(core.Object): """ return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs) + def GetPartialTextExtents(*args, **kwargs): + """GetPartialTextExtents(String text) -> wxArrayInt""" + return _gdi.DC_GetPartialTextExtents(*args, **kwargs) + def GetSize(*args, **kwargs): """ GetSize() -> Size @@ -2693,8 +2732,8 @@ class DC(core.Object): def DrawPolygonList(self, polygons, pens=None, brushes=None): - - + ## Note: This does not currently support fill style or offset + ## you can always use the non-List version if need be. if pens is None: pens = [] elif isinstance(pens, wx.Pen): @@ -2711,9 +2750,9 @@ class DC(core.Object): def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None): - - - + ## NOTE: this does not currently support changing the font + ## Make sure you set Background mode to wxSolid (DC.SetBackgroundMode) + ## If you want backgounds to do anything. if type(textList) == type(''): textList = [textList] elif len(textList) != len(coords): @@ -2771,12 +2810,18 @@ def MemoryDCFromDC(*args, **kwargs): #--------------------------------------------------------------------------- +BUFFER_DC_OVERWRITE_BG = _gdi.BUFFER_DC_OVERWRITE_BG +BUFFER_DC_PRESERVE_BG = _gdi.BUFFER_DC_PRESERVE_BG +BUFFER_DC_DEFAULT = _gdi.BUFFER_DC_DEFAULT class BufferedDC(MemoryDC): def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(DC dc, Bitmap buffer) -> BufferedDC""" - newobj = _gdi.new_BufferedDC(*args, **kwargs) + def __init__(self, *args): + """ + __init__(DC dc, Bitmap buffer) -> BufferedDC + __init__(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC + """ + newobj = _gdi.new_BufferedDC(*args) self.this = newobj.this self.thisown = 1 del newobj.thisown @@ -2794,9 +2839,9 @@ class BufferedDCPtr(BufferedDC): self.__class__ = BufferedDC _gdi.BufferedDC_swigregister(BufferedDCPtr) -def BufferedDCInternalBuffer(*args, **kwargs): - """BufferedDCInternalBuffer(DC dc, Size area) -> BufferedDC""" - val = _gdi.new_BufferedDCInternalBuffer(*args, **kwargs) +def BufferedDCInternalBuffer(*args): + """BufferedDCInternalBuffer(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC""" + val = _gdi.new_BufferedDCInternalBuffer(*args) val.thisown = 1 val._dc = args[0] # save a ref so the other dc will not be deleted before self return val @@ -2804,9 +2849,12 @@ def BufferedDCInternalBuffer(*args, **kwargs): class BufferedPaintDC(BufferedDC): def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC""" - newobj = _gdi.new_BufferedPaintDC(*args, **kwargs) + def __init__(self, *args): + """ + __init__(Window window, Bitmap buffer) -> BufferedPaintDC + __init__(Window window, int flags=BUFFER_DC_DEFAULT) -> BufferedPaintDC + """ + newobj = _gdi.new_BufferedPaintDC(*args) self.this = newobj.this self.thisown = 1 del newobj.thisown @@ -2945,12 +2993,12 @@ class PostScriptDC(DC): return _gdi.PostScriptDC_SetPrintData(*args, **kwargs) def SetResolution(*args, **kwargs): - """PostScriptDC.SetResolution(int ppi)""" + """SetResolution(int ppi)""" return _gdi.PostScriptDC_SetResolution(*args, **kwargs) SetResolution = staticmethod(SetResolution) def GetResolution(*args, **kwargs): - """PostScriptDC.GetResolution() -> int""" + """GetResolution() -> int""" return _gdi.PostScriptDC_GetResolution(*args, **kwargs) GetResolution = staticmethod(GetResolution) @@ -2976,7 +3024,7 @@ class MetaFile(core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxMetaFile instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(wxString filename=wxPyEmptyString) -> MetaFile""" + """__init__(String filename=EmptyString) -> MetaFile""" newobj = _gdi.new_MetaFile(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2994,8 +3042,8 @@ class MetaFileDC(DC): return "<%s.%s; proxy of C++ wxMetaFileDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(wxString filename=wxPyEmptyString, int width=0, int height=0, - wxString description=wxPyEmptyString) -> MetaFileDC + __init__(String filename=EmptyString, int width=0, int height=0, + String description=EmptyString) -> MetaFileDC """ newobj = _gdi.new_MetaFileDC(*args, **kwargs) self.this = newobj.this @@ -3026,6 +3074,246 @@ class PrinterDCPtr(PrinterDC): self.__class__ = PrinterDC _gdi.PrinterDC_swigregister(PrinterDCPtr) +class DC_old(DC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = DC.FloodFillXY + GetPixel = DC.GetPixelXY + DrawLine = DC.DrawLineXY + CrossHair = DC.CrossHairXY + DrawArc = DC.DrawArcXY + DrawCheckMark = DC.DrawCheckMarkXY + DrawEllipticArc = DC.DrawEllipticArcXY + DrawPoint = DC.DrawPointXY + DrawRectangle = DC.DrawRectangleXY + DrawRoundedRectangle = DC.DrawRoundedRectangleXY + DrawCircle = DC.DrawCircleXY + DrawEllipse = DC.DrawEllipseXY + DrawIcon = DC.DrawIconXY + DrawBitmap = DC.DrawBitmapXY + DrawText = DC.DrawTextXY + DrawRotatedText = DC.DrawRotatedTextXY + Blit = DC.BlitXY + +class MemoryDC_old(MemoryDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = MemoryDC.FloodFillXY + GetPixel = MemoryDC.GetPixelXY + DrawLine = MemoryDC.DrawLineXY + CrossHair = MemoryDC.CrossHairXY + DrawArc = MemoryDC.DrawArcXY + DrawCheckMark = MemoryDC.DrawCheckMarkXY + DrawEllipticArc = MemoryDC.DrawEllipticArcXY + DrawPoint = MemoryDC.DrawPointXY + DrawRectangle = MemoryDC.DrawRectangleXY + DrawRoundedRectangle = MemoryDC.DrawRoundedRectangleXY + DrawCircle = MemoryDC.DrawCircleXY + DrawEllipse = MemoryDC.DrawEllipseXY + DrawIcon = MemoryDC.DrawIconXY + DrawBitmap = MemoryDC.DrawBitmapXY + DrawText = MemoryDC.DrawTextXY + DrawRotatedText = MemoryDC.DrawRotatedTextXY + Blit = MemoryDC.BlitXY + +class BufferedDC_old(BufferedDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = BufferedDC.FloodFillXY + GetPixel = BufferedDC.GetPixelXY + DrawLine = BufferedDC.DrawLineXY + CrossHair = BufferedDC.CrossHairXY + DrawArc = BufferedDC.DrawArcXY + DrawCheckMark = BufferedDC.DrawCheckMarkXY + DrawEllipticArc = BufferedDC.DrawEllipticArcXY + DrawPoint = BufferedDC.DrawPointXY + DrawRectangle = BufferedDC.DrawRectangleXY + DrawRoundedRectangle = BufferedDC.DrawRoundedRectangleXY + DrawCircle = BufferedDC.DrawCircleXY + DrawEllipse = BufferedDC.DrawEllipseXY + DrawIcon = BufferedDC.DrawIconXY + DrawBitmap = BufferedDC.DrawBitmapXY + DrawText = BufferedDC.DrawTextXY + DrawRotatedText = BufferedDC.DrawRotatedTextXY + Blit = BufferedDC.BlitXY + +class BufferedPaintDC_old(BufferedPaintDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = BufferedPaintDC.FloodFillXY + GetPixel = BufferedPaintDC.GetPixelXY + DrawLine = BufferedPaintDC.DrawLineXY + CrossHair = BufferedPaintDC.CrossHairXY + DrawArc = BufferedPaintDC.DrawArcXY + DrawCheckMark = BufferedPaintDC.DrawCheckMarkXY + DrawEllipticArc = BufferedPaintDC.DrawEllipticArcXY + DrawPoint = BufferedPaintDC.DrawPointXY + DrawRectangle = BufferedPaintDC.DrawRectangleXY + DrawRoundedRectangle = BufferedPaintDC.DrawRoundedRectangleXY + DrawCircle = BufferedPaintDC.DrawCircleXY + DrawEllipse = BufferedPaintDC.DrawEllipseXY + DrawIcon = BufferedPaintDC.DrawIconXY + DrawBitmap = BufferedPaintDC.DrawBitmapXY + DrawText = BufferedPaintDC.DrawTextXY + DrawRotatedText = BufferedPaintDC.DrawRotatedTextXY + Blit = BufferedPaintDC.BlitXY + +class ScreenDC_old(ScreenDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = ScreenDC.FloodFillXY + GetPixel = ScreenDC.GetPixelXY + DrawLine = ScreenDC.DrawLineXY + CrossHair = ScreenDC.CrossHairXY + DrawArc = ScreenDC.DrawArcXY + DrawCheckMark = ScreenDC.DrawCheckMarkXY + DrawEllipticArc = ScreenDC.DrawEllipticArcXY + DrawPoint = ScreenDC.DrawPointXY + DrawRectangle = ScreenDC.DrawRectangleXY + DrawRoundedRectangle = ScreenDC.DrawRoundedRectangleXY + DrawCircle = ScreenDC.DrawCircleXY + DrawEllipse = ScreenDC.DrawEllipseXY + DrawIcon = ScreenDC.DrawIconXY + DrawBitmap = ScreenDC.DrawBitmapXY + DrawText = ScreenDC.DrawTextXY + DrawRotatedText = ScreenDC.DrawRotatedTextXY + Blit = ScreenDC.BlitXY + +class ClientDC_old(ClientDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = ClientDC.FloodFillXY + GetPixel = ClientDC.GetPixelXY + DrawLine = ClientDC.DrawLineXY + CrossHair = ClientDC.CrossHairXY + DrawArc = ClientDC.DrawArcXY + DrawCheckMark = ClientDC.DrawCheckMarkXY + DrawEllipticArc = ClientDC.DrawEllipticArcXY + DrawPoint = ClientDC.DrawPointXY + DrawRectangle = ClientDC.DrawRectangleXY + DrawRoundedRectangle = ClientDC.DrawRoundedRectangleXY + DrawCircle = ClientDC.DrawCircleXY + DrawEllipse = ClientDC.DrawEllipseXY + DrawIcon = ClientDC.DrawIconXY + DrawBitmap = ClientDC.DrawBitmapXY + DrawText = ClientDC.DrawTextXY + DrawRotatedText = ClientDC.DrawRotatedTextXY + Blit = ClientDC.BlitXY + +class PaintDC_old(PaintDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = PaintDC.FloodFillXY + GetPixel = PaintDC.GetPixelXY + DrawLine = PaintDC.DrawLineXY + CrossHair = PaintDC.CrossHairXY + DrawArc = PaintDC.DrawArcXY + DrawCheckMark = PaintDC.DrawCheckMarkXY + DrawEllipticArc = PaintDC.DrawEllipticArcXY + DrawPoint = PaintDC.DrawPointXY + DrawRectangle = PaintDC.DrawRectangleXY + DrawRoundedRectangle = PaintDC.DrawRoundedRectangleXY + DrawCircle = PaintDC.DrawCircleXY + DrawEllipse = PaintDC.DrawEllipseXY + DrawIcon = PaintDC.DrawIconXY + DrawBitmap = PaintDC.DrawBitmapXY + DrawText = PaintDC.DrawTextXY + DrawRotatedText = PaintDC.DrawRotatedTextXY + Blit = PaintDC.BlitXY + +class WindowDC_old(WindowDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = WindowDC.FloodFillXY + GetPixel = WindowDC.GetPixelXY + DrawLine = WindowDC.DrawLineXY + CrossHair = WindowDC.CrossHairXY + DrawArc = WindowDC.DrawArcXY + DrawCheckMark = WindowDC.DrawCheckMarkXY + DrawEllipticArc = WindowDC.DrawEllipticArcXY + DrawPoint = WindowDC.DrawPointXY + DrawRectangle = WindowDC.DrawRectangleXY + DrawRoundedRectangle = WindowDC.DrawRoundedRectangleXY + DrawCircle = WindowDC.DrawCircleXY + DrawEllipse = WindowDC.DrawEllipseXY + DrawIcon = WindowDC.DrawIconXY + DrawBitmap = WindowDC.DrawBitmapXY + DrawText = WindowDC.DrawTextXY + DrawRotatedText = WindowDC.DrawRotatedTextXY + Blit = WindowDC.BlitXY + +class MirrorDC_old(MirrorDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = MirrorDC.FloodFillXY + GetPixel = MirrorDC.GetPixelXY + DrawLine = MirrorDC.DrawLineXY + CrossHair = MirrorDC.CrossHairXY + DrawArc = MirrorDC.DrawArcXY + DrawCheckMark = MirrorDC.DrawCheckMarkXY + DrawEllipticArc = MirrorDC.DrawEllipticArcXY + DrawPoint = MirrorDC.DrawPointXY + DrawRectangle = MirrorDC.DrawRectangleXY + DrawRoundedRectangle = MirrorDC.DrawRoundedRectangleXY + DrawCircle = MirrorDC.DrawCircleXY + DrawEllipse = MirrorDC.DrawEllipseXY + DrawIcon = MirrorDC.DrawIconXY + DrawBitmap = MirrorDC.DrawBitmapXY + DrawText = MirrorDC.DrawTextXY + DrawRotatedText = MirrorDC.DrawRotatedTextXY + Blit = MirrorDC.BlitXY + +class PostScriptDC_old(PostScriptDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = PostScriptDC.FloodFillXY + GetPixel = PostScriptDC.GetPixelXY + DrawLine = PostScriptDC.DrawLineXY + CrossHair = PostScriptDC.CrossHairXY + DrawArc = PostScriptDC.DrawArcXY + DrawCheckMark = PostScriptDC.DrawCheckMarkXY + DrawEllipticArc = PostScriptDC.DrawEllipticArcXY + DrawPoint = PostScriptDC.DrawPointXY + DrawRectangle = PostScriptDC.DrawRectangleXY + DrawRoundedRectangle = PostScriptDC.DrawRoundedRectangleXY + DrawCircle = PostScriptDC.DrawCircleXY + DrawEllipse = PostScriptDC.DrawEllipseXY + DrawIcon = PostScriptDC.DrawIconXY + DrawBitmap = PostScriptDC.DrawBitmapXY + DrawText = PostScriptDC.DrawTextXY + DrawRotatedText = PostScriptDC.DrawRotatedTextXY + Blit = PostScriptDC.BlitXY + +class MetaFileDC_old(MetaFileDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = MetaFileDC.FloodFillXY + GetPixel = MetaFileDC.GetPixelXY + DrawLine = MetaFileDC.DrawLineXY + CrossHair = MetaFileDC.CrossHairXY + DrawArc = MetaFileDC.DrawArcXY + DrawCheckMark = MetaFileDC.DrawCheckMarkXY + DrawEllipticArc = MetaFileDC.DrawEllipticArcXY + DrawPoint = MetaFileDC.DrawPointXY + DrawRectangle = MetaFileDC.DrawRectangleXY + DrawRoundedRectangle = MetaFileDC.DrawRoundedRectangleXY + DrawCircle = MetaFileDC.DrawCircleXY + DrawEllipse = MetaFileDC.DrawEllipseXY + DrawIcon = MetaFileDC.DrawIconXY + DrawBitmap = MetaFileDC.DrawBitmapXY + DrawText = MetaFileDC.DrawTextXY + DrawRotatedText = MetaFileDC.DrawRotatedTextXY + Blit = MetaFileDC.BlitXY + +class PrinterDC_old(PrinterDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = PrinterDC.FloodFillXY + GetPixel = PrinterDC.GetPixelXY + DrawLine = PrinterDC.DrawLineXY + CrossHair = PrinterDC.CrossHairXY + DrawArc = PrinterDC.DrawArcXY + DrawCheckMark = PrinterDC.DrawCheckMarkXY + DrawEllipticArc = PrinterDC.DrawEllipticArcXY + DrawPoint = PrinterDC.DrawPointXY + DrawRectangle = PrinterDC.DrawRectangleXY + DrawRoundedRectangle = PrinterDC.DrawRoundedRectangleXY + DrawCircle = PrinterDC.DrawCircleXY + DrawEllipse = PrinterDC.DrawEllipseXY + DrawIcon = PrinterDC.DrawIconXY + DrawBitmap = PrinterDC.DrawBitmapXY + DrawText = PrinterDC.DrawTextXY + DrawRotatedText = PrinterDC.DrawRotatedTextXY + Blit = PrinterDC.BlitXY + #--------------------------------------------------------------------------- IMAGELIST_DRAW_NORMAL = _gdi.IMAGELIST_DRAW_NORMAL @@ -3126,6 +3414,49 @@ class PenListPtr(PenList): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = PenList _gdi.PenList_swigregister(PenListPtr) +cvar = _gdi.cvar +NORMAL_FONT = cvar.NORMAL_FONT +SMALL_FONT = cvar.SMALL_FONT +ITALIC_FONT = cvar.ITALIC_FONT +SWISS_FONT = cvar.SWISS_FONT +RED_PEN = cvar.RED_PEN +CYAN_PEN = cvar.CYAN_PEN +GREEN_PEN = cvar.GREEN_PEN +BLACK_PEN = cvar.BLACK_PEN +WHITE_PEN = cvar.WHITE_PEN +TRANSPARENT_PEN = cvar.TRANSPARENT_PEN +BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN +GREY_PEN = cvar.GREY_PEN +MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN +LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN +BLUE_BRUSH = cvar.BLUE_BRUSH +GREEN_BRUSH = cvar.GREEN_BRUSH +WHITE_BRUSH = cvar.WHITE_BRUSH +BLACK_BRUSH = cvar.BLACK_BRUSH +TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH +CYAN_BRUSH = cvar.CYAN_BRUSH +RED_BRUSH = cvar.RED_BRUSH +GREY_BRUSH = cvar.GREY_BRUSH +MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH +LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH +BLACK = cvar.BLACK +WHITE = cvar.WHITE +RED = cvar.RED +BLUE = cvar.BLUE +GREEN = cvar.GREEN +CYAN = cvar.CYAN +LIGHT_GREY = cvar.LIGHT_GREY +STANDARD_CURSOR = cvar.STANDARD_CURSOR +HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR +CROSS_CURSOR = cvar.CROSS_CURSOR +NullBitmap = cvar.NullBitmap +NullIcon = cvar.NullIcon +NullCursor = cvar.NullCursor +NullPen = cvar.NullPen +NullBrush = cvar.NullBrush +NullPalette = cvar.NullPalette +NullFont = cvar.NullFont +NullColour = cvar.NullColour class BrushList(core.Object): def __init__(self): raise RuntimeError, "No constructor defined" @@ -3171,20 +3502,20 @@ class ColourDatabase(core.Object): except: pass def Find(*args, **kwargs): - """Find(wxString name) -> Colour""" + """Find(String name) -> Colour""" return _gdi.ColourDatabase_Find(*args, **kwargs) def FindName(*args, **kwargs): - """FindName(Colour colour) -> wxString""" + """FindName(Colour colour) -> String""" return _gdi.ColourDatabase_FindName(*args, **kwargs) FindColour = Find def AddColour(*args, **kwargs): - """AddColour(wxString name, Colour colour)""" + """AddColour(String name, Colour colour)""" return _gdi.ColourDatabase_AddColour(*args, **kwargs) def Append(*args, **kwargs): - """Append(wxString name, int red, int green, int blue)""" + """Append(String name, int red, int green, int blue)""" return _gdi.ColourDatabase_Append(*args, **kwargs) @@ -3206,8 +3537,8 @@ class FontList(core.Object): def FindOrCreateFont(*args, **kwargs): """ FindOrCreateFont(int point_size, int family, int style, int weight, - bool underline=False, wxString facename=wxPyEmptyString, - wxFontEncoding encoding=FONTENCODING_DEFAULT) -> Font + bool underline=False, String facename=EmptyString, + int encoding=FONTENCODING_DEFAULT) -> Font """ return _gdi.FontList_FindOrCreateFont(*args, **kwargs) @@ -3229,6 +3560,7 @@ _gdi.FontList_swigregister(FontListPtr) #--------------------------------------------------------------------------- +NullColor = NullColour #--------------------------------------------------------------------------- class Effects(core.Object): @@ -3302,49 +3634,6 @@ class EffectsPtr(Effects): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = Effects _gdi.Effects_swigregister(EffectsPtr) -cvar = _gdi.cvar -NORMAL_FONT = cvar.NORMAL_FONT -SMALL_FONT = cvar.SMALL_FONT -ITALIC_FONT = cvar.ITALIC_FONT -SWISS_FONT = cvar.SWISS_FONT -RED_PEN = cvar.RED_PEN -CYAN_PEN = cvar.CYAN_PEN -GREEN_PEN = cvar.GREEN_PEN -BLACK_PEN = cvar.BLACK_PEN -WHITE_PEN = cvar.WHITE_PEN -TRANSPARENT_PEN = cvar.TRANSPARENT_PEN -BLACK_DASHED_PEN = cvar.BLACK_DASHED_PEN -GREY_PEN = cvar.GREY_PEN -MEDIUM_GREY_PEN = cvar.MEDIUM_GREY_PEN -LIGHT_GREY_PEN = cvar.LIGHT_GREY_PEN -BLUE_BRUSH = cvar.BLUE_BRUSH -GREEN_BRUSH = cvar.GREEN_BRUSH -WHITE_BRUSH = cvar.WHITE_BRUSH -BLACK_BRUSH = cvar.BLACK_BRUSH -TRANSPARENT_BRUSH = cvar.TRANSPARENT_BRUSH -CYAN_BRUSH = cvar.CYAN_BRUSH -RED_BRUSH = cvar.RED_BRUSH -GREY_BRUSH = cvar.GREY_BRUSH -MEDIUM_GREY_BRUSH = cvar.MEDIUM_GREY_BRUSH -LIGHT_GREY_BRUSH = cvar.LIGHT_GREY_BRUSH -BLACK = cvar.BLACK -WHITE = cvar.WHITE -RED = cvar.RED -BLUE = cvar.BLUE -GREEN = cvar.GREEN -CYAN = cvar.CYAN -LIGHT_GREY = cvar.LIGHT_GREY -STANDARD_CURSOR = cvar.STANDARD_CURSOR -HOURGLASS_CURSOR = cvar.HOURGLASS_CURSOR -CROSS_CURSOR = cvar.CROSS_CURSOR -NullBitmap = cvar.NullBitmap -NullIcon = cvar.NullIcon -NullCursor = cvar.NullCursor -NullPen = cvar.NullPen -NullBrush = cvar.NullBrush -NullPalette = cvar.NullPalette -NullFont = cvar.NullFont -NullColour = cvar.NullColour TheFontList = cvar.TheFontList ThePenList = cvar.ThePenList TheBrushList = cvar.TheBrushList