X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d55e5bfc69a44b707b15fd27050d8bf634ef92c7..df16c649d21716a3e54eb2598477fa9ed970f278:/wxPython/src/mac/_gdi.py diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index def235f334..36830e3895 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -5,7 +5,6 @@ import _gdi_ import _core wx = _core -__docfilter__ = wx.__docfilter__ #--------------------------------------------------------------------------- class GDIObject(_core.Object): @@ -47,29 +46,35 @@ _gdi_.GDIObject_swigregister(GDIObjectPtr) class Colour(_core.Object): """ - A colour is an object representing a combination of Red, Green, and Blue (RGB) - intensity values, and is used to determine drawing colours, window colours, - etc. Valid RGB values are in the range 0 to 255. + A colour is an object representing a combination of Red, Green, and + Blue (RGB) intensity values, and is used to determine drawing colours, + window colours, etc. Valid RGB values are in the range 0 to 255. - In wxPython there are typemaps that will automatically convert from a colour - name, or from a '#RRGGBB' colour hex value string to a wx.Colour object when - calling C++ methods that expect a wxColour. This means that the following are - all equivallent: + In wxPython there are typemaps that will automatically convert from a + colour name, or from a '#RRGGBB' colour hex value string to a + wx.Colour object when calling C++ methods that expect a wxColour. + This means that the following are all equivallent:: win.SetBackgroundColour(wxColour(0,0,255)) win.SetBackgroundColour('BLUE') win.SetBackgroundColour('#0000FF') - You can retrieve the various current system colour settings with - wx.SystemSettings.GetColour. + Additional colour names and their coresponding values can be added + using `wx.ColourDatabase`. Various system colours (as set in the + user's system preferences) can be retrieved with + `wx.SystemSettings.GetColour`. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(self, unsigned char red=0, unsigned char green=0, unsigned char blue=0) -> Colour + __init__(self, byte red=0, byte green=0, byte blue=0) -> Colour Constructs a colour from red, green and blue values. + + :see: Alternate constructors `wx.NamedColour` and `wx.ColourRGB`. + """ newobj = _gdi_.new_Colour(*args, **kwargs) self.this = newobj.this @@ -83,7 +88,7 @@ class Colour(_core.Object): def Red(*args, **kwargs): """ - Red(self) -> unsigned char + Red(self) -> byte Returns the red intensity. """ @@ -91,7 +96,7 @@ class Colour(_core.Object): def Green(*args, **kwargs): """ - Green(self) -> unsigned char + Green(self) -> byte Returns the green intensity. """ @@ -99,7 +104,7 @@ class Colour(_core.Object): def Blue(*args, **kwargs): """ - Blue(self) -> unsigned char + Blue(self) -> byte Returns the blue intensity. """ @@ -116,7 +121,7 @@ class Colour(_core.Object): def Set(*args, **kwargs): """ - Set(self, unsigned char red, unsigned char green, unsigned char blue) + Set(self, byte red, byte green, byte blue) Sets the RGB intensity values. """ @@ -134,7 +139,8 @@ class Colour(_core.Object): """ SetFromName(self, String colourName) - Sets the RGB intensity values using a colour name listed in wx.TheColourDatabase. + Sets the RGB intensity values using a colour name listed in + ``wx.TheColourDatabase``. """ return _gdi_.Colour_SetFromName(*args, **kwargs) @@ -143,8 +149,8 @@ class Colour(_core.Object): GetPixel(self) -> long Returns a pixel value which is platform-dependent. On Windows, a - COLORREF is returned. On X, an allocated pixel value is returned. - -1 is returned if the pixel is invalid (on X, unallocated). + COLORREF is returned. On X, an allocated pixel value is returned. -1 + is returned if the pixel is invalid (on X, unallocated). """ return _gdi_.Colour_GetPixel(*args, **kwargs) @@ -180,9 +186,9 @@ class Colour(_core.Object): """ return _gdi_.Colour_GetRGB(*args, **kwargs) - asTuple = Get - def __str__(self): return str(self.asTuple()) - def __repr__(self): return 'wx.Colour' + str(self.asTuple()) + asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead") + def __str__(self): return str(self.Get()) + def __repr__(self): return 'wx.Colour' + str(self.Get()) def __nonzero__(self): return self.Ok() __safe_for_unpickling__ = True def __reduce__(self): return (Colour, self.Get()) @@ -199,7 +205,8 @@ def NamedColour(*args, **kwargs): """ NamedColour(String colorName) -> Colour - Constructs a colour object using a colour name listed in wx.TheColourDatabase. + Constructs a colour object using a colour name listed in + ``wx.TheColourDatabase``. """ val = _gdi_.new_NamedColour(*args, **kwargs) val.thisown = 1 @@ -324,6 +331,16 @@ class Pen(GDIObject): """GetDashes(self) -> PyObject""" return _gdi_.Pen_GetDashes(*args, **kwargs) + def _SetDashes(*args, **kwargs): + """_SetDashes(self, PyObject _self, PyObject pyDashes)""" + return _gdi_.Pen__SetDashes(*args, **kwargs) + + def SetDashes(self, dashes): + """ + Associate a list of dash lengths with the Pen. + """ + self._SetDashes(self, dashes) + def __eq__(*args, **kwargs): """__eq__(self, Pen other) -> bool""" return _gdi_.Pen___eq__(*args, **kwargs) @@ -341,40 +358,13 @@ class PenPtr(Pen): self.__class__ = Pen _gdi_.Pen_swigregister(PenPtr) -class PyPen(Pen): - def __repr__(self): - return "<%s.%s; proxy of C++ wxPyPen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(self, Colour colour, int width=1, int style=SOLID) -> PyPen""" - newobj = _gdi_.new_PyPen(*args, **kwargs) - self.this = newobj.this - self.thisown = 1 - del newobj.thisown - def __del__(self, destroy=_gdi_.delete_PyPen): - """__del__(self)""" - try: - if self.thisown: destroy(self) - except: pass - - def SetDashes(*args, **kwargs): - """SetDashes(self, int dashes, wxDash dashes_array)""" - return _gdi_.PyPen_SetDashes(*args, **kwargs) - - -class PyPenPtr(PyPen): - def __init__(self, this): - self.this = this - if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = PyPen -_gdi_.PyPen_swigregister(PyPenPtr) - -Pen = PyPen #--------------------------------------------------------------------------- class Brush(GDIObject): """ - A brush is a drawing tool for filling in areas. It is used for painting the - background of rectangles, ellipses, etc. It has a colour and a style. + A brush is a drawing tool for filling in areas. It is used for + painting the background of rectangles, ellipses, etc. when drawing on + a `wx.DC`. It has a colour and a style. """ def __repr__(self): return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -382,7 +372,7 @@ class Brush(GDIObject): """ __init__(self, Colour colour, int style=SOLID) -> Brush - Constructs a brush from a colour object and style. + Constructs a brush from a `wx.Colour` object and a style. """ newobj = _gdi_.new_Brush(*args, **kwargs) self.this = newobj.this @@ -395,31 +385,62 @@ class Brush(GDIObject): except: pass def SetColour(*args, **kwargs): - """SetColour(self, Colour col)""" + """ + SetColour(self, Colour col) + + Set the brush's `wx.Colour`. + """ return _gdi_.Brush_SetColour(*args, **kwargs) def SetStyle(*args, **kwargs): - """SetStyle(self, int style)""" + """ + SetStyle(self, int style) + + Sets the style of the brush. See `__init__` for a listing of styles. + """ return _gdi_.Brush_SetStyle(*args, **kwargs) def SetStipple(*args, **kwargs): - """SetStipple(self, Bitmap stipple)""" + """ + SetStipple(self, Bitmap stipple) + + Sets the stipple `wx.Bitmap`. + """ return _gdi_.Brush_SetStipple(*args, **kwargs) def GetColour(*args, **kwargs): - """GetColour(self) -> Colour""" + """ + GetColour(self) -> Colour + + Returns the `wx.Colour` of the brush. + """ return _gdi_.Brush_GetColour(*args, **kwargs) def GetStyle(*args, **kwargs): - """GetStyle(self) -> int""" + """ + GetStyle(self) -> int + + Returns the style of the brush. See `__init__` for a listing of + styles. + """ return _gdi_.Brush_GetStyle(*args, **kwargs) def GetStipple(*args, **kwargs): - """GetStipple(self) -> Bitmap""" + """ + GetStipple(self) -> Bitmap + + Returns the stiple `wx.Bitmap` of the brush. If the brush does not + have a wx.STIPPLE style, then the return value may be non-None but an + uninitialised bitmap (`wx.Bitmap.Ok` returns False). + """ return _gdi_.Brush_GetStipple(*args, **kwargs) def Ok(*args, **kwargs): - """Ok(self) -> bool""" + """ + Ok(self) -> bool + + Returns True if the brush is initialised and valid. + """ return _gdi_.Brush_Ok(*args, **kwargs) def MacGetTheme(*args, **kwargs): @@ -440,6 +461,14 @@ class BrushPtr(Brush): _gdi_.Brush_swigregister(BrushPtr) class Bitmap(GDIObject): + """ + The wx.Bitmap class encapsulates the concept of a platform-dependent + bitmap. It can be either monochrome or colour, and either loaded from + a file or created dynamically. A bitmap can be selected into a memory + device context (instance of `wx.MemoryDC`). This enables the bitmap to + be copied to a window or memory device context using `wx.DC.Blit`, or + to be used as a drawing surface. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -499,9 +528,9 @@ class Bitmap(GDIObject): """ ConvertToImage(self) -> Image - Creates a platform-independent image from a platform-dependent bitmap. This - preserves mask information so that bitmaps and images can be converted back - and forth without loss in that respect. + Creates a platform-independent image from a platform-dependent + bitmap. This preserves mask information so that bitmaps and images can + be converted back and forth without loss in that respect. """ return _gdi_.Bitmap_ConvertToImage(*args, **kwargs) @@ -509,8 +538,11 @@ class Bitmap(GDIObject): """ GetMask(self) -> Mask - Gets the associated mask (if any) which may have been loaded from a file - or explpicitly set for the bitmap. + Gets the associated mask (if any) which may have been loaded from a + file or explpicitly set for the bitmap. + + :see: `SetMask`, `wx.Mask` + """ return _gdi_.Bitmap_GetMask(*args, **kwargs) @@ -519,6 +551,9 @@ class Bitmap(GDIObject): SetMask(self, Mask mask) Sets the mask for this bitmap. + + :see: `GetMask`, `wx.Mask` + """ return _gdi_.Bitmap_SetMask(*args, **kwargs) @@ -534,16 +569,18 @@ class Bitmap(GDIObject): """ GetSubBitmap(self, Rect rect) -> Bitmap - Returns a sub bitmap of the current one as long as the rect belongs entirely - to the bitmap. This function preserves bit depth and mask information. + Returns a sub-bitmap of the current one as long as the rect belongs + entirely to the bitmap. This function preserves bit depth and mask + information. """ return _gdi_.Bitmap_GetSubBitmap(*args, **kwargs) def SaveFile(*args, **kwargs): """ - SaveFile(self, String name, int type, Palette palette=(wxPalette *) NULL) -> bool + SaveFile(self, String name, int type, Palette palette=None) -> bool - Saves a bitmap in the named file. + Saves a bitmap in the named file. See `__init__` for a description of + the ``type`` parameter. """ return _gdi_.Bitmap_SaveFile(*args, **kwargs) @@ -551,7 +588,8 @@ class Bitmap(GDIObject): """ LoadFile(self, String name, int type) -> bool - Loads a bitmap from a file + Loads a bitmap from a file. See `__init__` for a description of the + ``type`` parameter. """ return _gdi_.Bitmap_LoadFile(*args, **kwargs) @@ -563,7 +601,7 @@ class Bitmap(GDIObject): """ SetHeight(self, int height) - Set the height property (does not affect the bitmap data). + Set the height property (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetHeight(*args, **kwargs) @@ -571,7 +609,7 @@ class Bitmap(GDIObject): """ SetWidth(self, int width) - Set the width property (does not affect the bitmap data). + Set the width property (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetWidth(*args, **kwargs) @@ -579,7 +617,7 @@ class Bitmap(GDIObject): """ SetDepth(self, int depth) - Set the depth property (does not affect the bitmap data). + Set the depth property (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetDepth(*args, **kwargs) @@ -587,7 +625,7 @@ class Bitmap(GDIObject): """ SetSize(self, Size size) - Set the bitmap size + Set the bitmap size (does not affect the existing bitmap data). """ return _gdi_.Bitmap_SetSize(*args, **kwargs) @@ -608,11 +646,23 @@ class BitmapPtr(Bitmap): self.__class__ = Bitmap _gdi_.Bitmap_swigregister(BitmapPtr) +def EmptyBitmap(*args, **kwargs): + """ + EmptyBitmap(int width, int height, int depth=-1) -> Bitmap + + Creates a new bitmap of the given size. A depth of -1 indicates the + depth of the current screen or visual. Some platforms only support 1 + for monochrome and -1 for the current colour setting. + """ + val = _gdi_.new_EmptyBitmap(*args, **kwargs) + val.thisown = 1 + return val + def BitmapFromIcon(*args, **kwargs): """ BitmapFromIcon(Icon icon) -> Bitmap - Create a new bitmap from an Icon object. + Create a new bitmap from a `wx.Icon` object. """ val = _gdi_.new_BitmapFromIcon(*args, **kwargs) val.thisown = 1 @@ -622,10 +672,11 @@ def BitmapFromImage(*args, **kwargs): """ BitmapFromImage(Image image, int depth=-1) -> Bitmap - Creates bitmap object from the image. This has to be done to actually display - an image as you cannot draw an image directly on a window. The resulting - bitmap will use the provided colour depth (or that of the current system if - depth is -1) which entails that a colour reduction has to take place. + Creates bitmap object from a `wx.Image`. This has to be done to + actually display a `wx.Image` as you cannot draw an image directly on + a window. The resulting bitmap will use the provided colour depth (or + that of the current screen colour depth if depth is -1) which entails + that a colour reduction may have to take place. """ val = _gdi_.new_BitmapFromImage(*args, **kwargs) val.thisown = 1 @@ -645,34 +696,26 @@ def BitmapFromBits(*args, **kwargs): """ BitmapFromBits(PyObject bits, int width, int height, int depth=1) -> Bitmap - Creates a bitmap from an array of bits. You should only use this function for - monochrome bitmaps (depth 1) in portable programs: in this case the bits - parameter should contain an XBM image. For other bit depths, the behaviour is - platform dependent. + Creates a bitmap from an array of bits. You should only use this + function for monochrome bitmaps (depth 1) in portable programs: in + this case the bits parameter should contain an XBM image. For other + bit depths, the behaviour is platform dependent. """ val = _gdi_.new_BitmapFromBits(*args, **kwargs) val.thisown = 1 return val -def EmptyBitmap(*args): - """ - EmptyBitmap(int width, int height, int depth=-1) -> Bitmap - EmptyBitmap(Size size, int depth=-1) -> Bitmap - - Creates a new bitmap of the given size. A depth of -1 indicates - the depth of the current screen or visual. Some platforms only - support 1 for monochrome and -1 for the current colour setting. - """ - val = _gdi_.new_EmptyBitmap(*args) - val.thisown = 1 - return val - class Mask(_core.Object): """ - This class encapsulates a monochrome mask bitmap, where the masked area is - black and the unmasked area is white. When associated with a bitmap and drawn - in a device context, the unmasked area of the bitmap will be drawn, and the - masked area will not be drawn. + This class encapsulates a monochrome mask bitmap, where the masked + area is black and the unmasked area is white. When associated with a + bitmap and drawn in a device context, the unmasked area of the bitmap + will be drawn, and the masked area will not be drawn. + + A mask may be associated with a `wx.Bitmap`. It is used in + `wx.DC.DrawBitmap` or `wx.DC.Blit` when the source device context is a + `wx.MemoryDC` with a `wx.Bitmap` selected into it that contains a + mask. """ def __repr__(self): return "<%s.%s; proxy of C++ wxMask instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -680,8 +723,13 @@ class Mask(_core.Object): """ __init__(self, Bitmap bitmap, Colour colour=NullColour) -> Mask - 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. + Constructs a mask from a `wx.Bitmap` and a `wx.Colour` in that bitmap + that indicates the transparent portions of the mask. In other words, + the pixels in ``bitmap`` that match ``colour`` will be the transparent + portions of the mask. If no ``colour`` or an invalid ``colour`` is + passed then BLACK is used. + + :see: `wx.Bitmap`, `wx.Colour` """ newobj = _gdi_.new_Mask(*args, **kwargs) self.this = newobj.this @@ -695,7 +743,7 @@ class MaskPtr(Mask): self.__class__ = Mask _gdi_.Mask_swigregister(MaskPtr) -MaskColour = Mask +MaskColour = wx._deprecated(Mask, "wx.MaskColour is deprecated, use `wx.Mask` instead.") class Icon(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -869,15 +917,15 @@ def IconBundleFromIcon(*args, **kwargs): class Cursor(GDIObject): """ - A cursor is a small bitmap usually used for denoting where the - mouse pointer is, with a picture that might indicate the - interpretation of a mouse click. + A cursor is a small bitmap usually used for denoting where the mouse + pointer is, with a picture that might indicate the interpretation of a + mouse click. A single cursor object may be used in many windows (any subwindow - type). The wxWindows convention is to set the cursor for a - window, as in X, rather than to set it globally as in MS Windows, - although a global wx.SetCursor function is also available for use - on MS Windows. + type). The wxWindows convention is to set the cursor for a window, as + in X, rather than to set it globally as in MS Windows, although a + global `wx.SetCursor` function is also available for use on MS Windows. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -886,11 +934,11 @@ class Cursor(GDIObject): __init__(self, String cursorName, long type, int hotSpotX=0, int hotSpotY=0) -> Cursor Construct a Cursor from a file. Specify the type of file using - wx.BITAMP_TYPE* constants, and specify the hotspot if not using a - .cur file. + wx.BITAMP_TYPE* constants, and specify the hotspot if not using a cur + file. - This cursor is not available on wxGTK, use wx.StockCursor, - wx.CursorFromImage, or wx.CursorFromBits instead. + This constructor is not available on wxGTK, use ``wx.StockCursor``, + ``wx.CursorFromImage``, or ``wx.CursorFromBits`` instead. """ newobj = _gdi_.new_Cursor(*args, **kwargs) self.this = newobj.this @@ -919,8 +967,8 @@ def StockCursor(*args, **kwargs): """ StockCursor(int id) -> Cursor - Create a cursor using one of the stock cursors. Note that not - all cursors are available on all platforms. + Create a cursor using one of the stock cursors. Note that not all + cursors are available on all platforms. """ val = _gdi_.new_StockCursor(*args, **kwargs) val.thisown = 1 @@ -930,17 +978,10 @@ def CursorFromImage(*args, **kwargs): """ CursorFromImage(Image image) -> Cursor - Constructs a cursor from a wxImage. The cursor is monochrome, - colors with the RGB elements all greater than 127 will be - foreground, colors less than this background. The mask (if any) - will be used as transparent. - - In MSW the foreground will be white and the background black. The - cursor is resized to 32x32 In GTK, the two most frequent colors - will be used for foreground and background. The cursor will be - displayed at the size of the image. On MacOS the cursor is - resized to 16x16 and currently only shown as black/white (mask - respected). + Constructs a cursor from a wxImage. The cursor is monochrome, colors + with the RGB elements all greater than 127 will be foreground, colors + less than this background. The mask (if any) will be used as + transparent. """ val = _gdi_.new_CursorFromImage(*args, **kwargs) val.thisown = 1 @@ -1431,12 +1472,12 @@ 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) @@ -1445,27 +1486,27 @@ class FontMapper(object): 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) -> int""" + """GetEncoding(size_t n) -> int""" return _gdi_.FontMapper_GetEncoding(*args, **kwargs) GetEncoding = staticmethod(GetEncoding) def GetEncodingName(*args, **kwargs): - """FontMapper.GetEncodingName(int encoding) -> String""" + """GetEncodingName(int encoding) -> String""" return _gdi_.FontMapper_GetEncodingName(*args, **kwargs) GetEncodingName = staticmethod(GetEncodingName) def GetEncodingDescription(*args, **kwargs): - """FontMapper.GetEncodingDescription(int encoding) -> String""" + """GetEncodingDescription(int encoding) -> String""" return _gdi_.FontMapper_GetEncodingDescription(*args, **kwargs) GetEncodingDescription = staticmethod(GetEncodingDescription) def GetEncodingFromName(*args, **kwargs): - """FontMapper.GetEncodingFromName(String name) -> int""" + """GetEncodingFromName(String name) -> int""" return _gdi_.FontMapper_GetEncodingFromName(*args, **kwargs) GetEncodingFromName = staticmethod(GetEncodingFromName) @@ -1478,7 +1519,7 @@ class FontMapper(object): return _gdi_.FontMapper_SetConfigPath(*args, **kwargs) def GetDefaultConfigPath(*args, **kwargs): - """FontMapper.GetDefaultConfigPath() -> String""" + """GetDefaultConfigPath() -> String""" return _gdi_.FontMapper_GetDefaultConfigPath(*args, **kwargs) GetDefaultConfigPath = staticmethod(GetDefaultConfigPath) @@ -1549,6 +1590,7 @@ class Font(GDIObject): String face=EmptyString, int encoding=FONTENCODING_DEFAULT) -> Font """ + if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName'] newobj = _gdi_.new_Font(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -1677,12 +1719,12 @@ class Font(GDIObject): return _gdi_.Font_GetNoAntiAliasing(*args, **kwargs) def GetDefaultEncoding(*args, **kwargs): - """Font.GetDefaultEncoding() -> int""" + """GetDefaultEncoding() -> int""" return _gdi_.Font_GetDefaultEncoding(*args, **kwargs) GetDefaultEncoding = staticmethod(GetDefaultEncoding) def SetDefaultEncoding(*args, **kwargs): - """Font.SetDefaultEncoding(int encoding)""" + """SetDefaultEncoding(int encoding)""" return _gdi_.Font_SetDefaultEncoding(*args, **kwargs) SetDefaultEncoding = staticmethod(SetDefaultEncoding) @@ -1696,12 +1738,14 @@ _gdi_.Font_swigregister(FontPtr) def FontFromNativeInfo(*args, **kwargs): """FontFromNativeInfo(NativeFontInfo info) -> Font""" + if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName'] val = _gdi_.new_FontFromNativeInfo(*args, **kwargs) val.thisown = 1 return val def FontFromNativeInfoString(*args, **kwargs): """FontFromNativeInfoString(String info) -> Font""" + if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName'] val = _gdi_.new_FontFromNativeInfoString(*args, **kwargs) val.thisown = 1 return val @@ -1711,6 +1755,7 @@ def Font2(*args, **kwargs): Font2(int pointSize, int family, int flags=FONTFLAG_DEFAULT, String face=EmptyString, int encoding=FONTENCODING_DEFAULT) -> Font """ + if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName'] val = _gdi_.new_Font2(*args, **kwargs) val.thisown = 1 return val @@ -2030,7 +2075,7 @@ class Locale(object): def __repr__(self): return "<%s.%s; proxy of C++ wxLocale instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, int language=LANGUAGE_DEFAULT, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> Locale""" + """__init__(self, int language=-1, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> Locale""" newobj = _gdi_.new_Locale(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2061,17 +2106,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() -> int""" + """GetSystemEncoding() -> int""" return _gdi_.Locale_GetSystemEncoding(*args, **kwargs) GetSystemEncoding = staticmethod(GetSystemEncoding) def GetSystemEncodingName(*args, **kwargs): - """Locale.GetSystemEncodingName() -> String""" + """GetSystemEncodingName() -> String""" return _gdi_.Locale_GetSystemEncodingName(*args, **kwargs) GetSystemEncodingName = staticmethod(GetSystemEncodingName) @@ -2097,7 +2142,7 @@ class Locale(object): return _gdi_.Locale_GetCanonicalName(*args, **kwargs) def AddCatalogLookupPathPrefix(*args, **kwargs): - """Locale.AddCatalogLookupPathPrefix(String prefix)""" + """AddCatalogLookupPathPrefix(String prefix)""" return _gdi_.Locale_AddCatalogLookupPathPrefix(*args, **kwargs) AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix) @@ -2110,22 +2155,22 @@ class Locale(object): 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) -> String""" + """GetLanguageName(int lang) -> String""" return _gdi_.Locale_GetLanguageName(*args, **kwargs) GetLanguageName = staticmethod(GetLanguageName) def FindLanguageInfo(*args, **kwargs): - """Locale.FindLanguageInfo(String 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) @@ -2214,17 +2259,17 @@ class EncodingConverter(_core.Object): return _gdi_.EncodingConverter_Convert(*args, **kwargs) def GetPlatformEquivalents(*args, **kwargs): - """EncodingConverter.GetPlatformEquivalents(int 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(int enc) -> wxFontEncodingArray""" + """GetAllEquivalents(int enc) -> wxFontEncodingArray""" return _gdi_.EncodingConverter_GetAllEquivalents(*args, **kwargs) GetAllEquivalents = staticmethod(GetAllEquivalents) def CanConvert(*args, **kwargs): - """EncodingConverter.CanConvert(int encIn, int encOut) -> bool""" + """CanConvert(int encIn, int encOut) -> bool""" return _gdi_.EncodingConverter_CanConvert(*args, **kwargs) CanConvert = staticmethod(CanConvert) @@ -2296,160 +2341,176 @@ class DC(_core.Object): """EndDrawing(self)""" return _gdi_.DC_EndDrawing(*args, **kwargs) - def FloodFillXY(*args, **kwargs): - """FloodFillXY(self, int x, int y, Colour col, int style=FLOOD_SURFACE) -> bool""" - return _gdi_.DC_FloodFillXY(*args, **kwargs) - def FloodFill(*args, **kwargs): - """FloodFill(self, Point pt, Colour col, int style=FLOOD_SURFACE) -> bool""" + """FloodFill(self, int x, int y, Colour col, int style=FLOOD_SURFACE) -> bool""" return _gdi_.DC_FloodFill(*args, **kwargs) - def GetPixelXY(*args, **kwargs): - """GetPixelXY(self, int x, int y) -> Colour""" - return _gdi_.DC_GetPixelXY(*args, **kwargs) + def FloodFillPoint(*args, **kwargs): + """FloodFillPoint(self, Point pt, Colour col, int style=FLOOD_SURFACE) -> bool""" + return _gdi_.DC_FloodFillPoint(*args, **kwargs) def GetPixel(*args, **kwargs): - """GetPixel(self, Point pt) -> Colour""" + """GetPixel(self, int x, int y) -> Colour""" return _gdi_.DC_GetPixel(*args, **kwargs) - def DrawLineXY(*args, **kwargs): - """DrawLineXY(self, int x1, int y1, int x2, int y2)""" - return _gdi_.DC_DrawLineXY(*args, **kwargs) + def GetPixelPoint(*args, **kwargs): + """GetPixelPoint(self, Point pt) -> Colour""" + return _gdi_.DC_GetPixelPoint(*args, **kwargs) def DrawLine(*args, **kwargs): - """DrawLine(self, Point pt1, Point pt2)""" + """DrawLine(self, int x1, int y1, int x2, int y2)""" return _gdi_.DC_DrawLine(*args, **kwargs) - def CrossHairXY(*args, **kwargs): - """CrossHairXY(self, int x, int y)""" - return _gdi_.DC_CrossHairXY(*args, **kwargs) + def DrawLinePoint(*args, **kwargs): + """DrawLinePoint(self, Point pt1, Point pt2)""" + return _gdi_.DC_DrawLinePoint(*args, **kwargs) def CrossHair(*args, **kwargs): - """CrossHair(self, Point pt)""" + """CrossHair(self, int x, int y)""" return _gdi_.DC_CrossHair(*args, **kwargs) - def DrawArcXY(*args, **kwargs): - """DrawArcXY(self, int x1, int y1, int x2, int y2, int xc, int yc)""" - return _gdi_.DC_DrawArcXY(*args, **kwargs) + def CrossHairPoint(*args, **kwargs): + """CrossHairPoint(self, Point pt)""" + return _gdi_.DC_CrossHairPoint(*args, **kwargs) def DrawArc(*args, **kwargs): - """DrawArc(self, Point pt1, Point pt2, Point centre)""" + """DrawArc(self, int x1, int y1, int x2, int y2, int xc, int yc)""" return _gdi_.DC_DrawArc(*args, **kwargs) - def DrawCheckMarkXY(*args, **kwargs): - """DrawCheckMarkXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_DrawCheckMarkXY(*args, **kwargs) + def DrawArcPoint(*args, **kwargs): + """DrawArcPoint(self, Point pt1, Point pt2, Point centre)""" + return _gdi_.DC_DrawArcPoint(*args, **kwargs) def DrawCheckMark(*args, **kwargs): - """DrawCheckMark(self, Rect rect)""" + """DrawCheckMark(self, int x, int y, int width, int height)""" return _gdi_.DC_DrawCheckMark(*args, **kwargs) - def DrawEllipticArcXY(*args, **kwargs): - """DrawEllipticArcXY(self, int x, int y, int w, int h, double sa, double ea)""" - return _gdi_.DC_DrawEllipticArcXY(*args, **kwargs) + def DrawCheckMarkRect(*args, **kwargs): + """DrawCheckMarkRect(self, Rect rect)""" + return _gdi_.DC_DrawCheckMarkRect(*args, **kwargs) def DrawEllipticArc(*args, **kwargs): - """DrawEllipticArc(self, Point pt, Size sz, double sa, double ea)""" + """DrawEllipticArc(self, int x, int y, int w, int h, double sa, double ea)""" return _gdi_.DC_DrawEllipticArc(*args, **kwargs) - def DrawPointXY(*args, **kwargs): - """DrawPointXY(self, int x, int y)""" - return _gdi_.DC_DrawPointXY(*args, **kwargs) + def DrawEllipticArcPointSize(*args, **kwargs): + """DrawEllipticArcPointSize(self, Point pt, Size sz, double sa, double ea)""" + return _gdi_.DC_DrawEllipticArcPointSize(*args, **kwargs) def DrawPoint(*args, **kwargs): - """DrawPoint(self, Point pt)""" + """DrawPoint(self, int x, int y)""" return _gdi_.DC_DrawPoint(*args, **kwargs) - def DrawRectangleXY(*args, **kwargs): - """DrawRectangleXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_DrawRectangleXY(*args, **kwargs) + def DrawPointPoint(*args, **kwargs): + """DrawPointPoint(self, Point pt)""" + return _gdi_.DC_DrawPointPoint(*args, **kwargs) def DrawRectangle(*args, **kwargs): - """DrawRectangle(self, Point pt, Size sz)""" + """DrawRectangle(self, int x, int y, int width, int height)""" return _gdi_.DC_DrawRectangle(*args, **kwargs) def DrawRectangleRect(*args, **kwargs): """DrawRectangleRect(self, Rect rect)""" return _gdi_.DC_DrawRectangleRect(*args, **kwargs) - def DrawRoundedRectangleXY(*args, **kwargs): - """DrawRoundedRectangleXY(self, int x, int y, int width, int height, double radius)""" - return _gdi_.DC_DrawRoundedRectangleXY(*args, **kwargs) + def DrawRectanglePointSize(*args, **kwargs): + """DrawRectanglePointSize(self, Point pt, Size sz)""" + return _gdi_.DC_DrawRectanglePointSize(*args, **kwargs) def DrawRoundedRectangle(*args, **kwargs): - """DrawRoundedRectangle(self, Point pt, Size sz, double radius)""" + """DrawRoundedRectangle(self, int x, int y, int width, int height, double radius)""" return _gdi_.DC_DrawRoundedRectangle(*args, **kwargs) def DrawRoundedRectangleRect(*args, **kwargs): """DrawRoundedRectangleRect(self, Rect r, double radius)""" return _gdi_.DC_DrawRoundedRectangleRect(*args, **kwargs) - def DrawCircleXY(*args, **kwargs): - """DrawCircleXY(self, int x, int y, int radius)""" - return _gdi_.DC_DrawCircleXY(*args, **kwargs) + def DrawRoundedRectanglePointSize(*args, **kwargs): + """DrawRoundedRectanglePointSize(self, Point pt, Size sz, double radius)""" + return _gdi_.DC_DrawRoundedRectanglePointSize(*args, **kwargs) def DrawCircle(*args, **kwargs): - """DrawCircle(self, Point pt, int radius)""" + """DrawCircle(self, int x, int y, int radius)""" return _gdi_.DC_DrawCircle(*args, **kwargs) - def DrawEllipseXY(*args, **kwargs): - """DrawEllipseXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_DrawEllipseXY(*args, **kwargs) + def DrawCirclePoint(*args, **kwargs): + """DrawCirclePoint(self, Point pt, int radius)""" + return _gdi_.DC_DrawCirclePoint(*args, **kwargs) def DrawEllipse(*args, **kwargs): - """DrawEllipse(self, Point pt, Size sz)""" + """DrawEllipse(self, int x, int y, int width, int height)""" return _gdi_.DC_DrawEllipse(*args, **kwargs) def DrawEllipseRect(*args, **kwargs): """DrawEllipseRect(self, Rect rect)""" return _gdi_.DC_DrawEllipseRect(*args, **kwargs) - def DrawIconXY(*args, **kwargs): - """DrawIconXY(self, Icon icon, int x, int y)""" - return _gdi_.DC_DrawIconXY(*args, **kwargs) + def DrawEllipsePointSize(*args, **kwargs): + """DrawEllipsePointSize(self, Point pt, Size sz)""" + return _gdi_.DC_DrawEllipsePointSize(*args, **kwargs) def DrawIcon(*args, **kwargs): - """DrawIcon(self, Icon icon, Point pt)""" + """DrawIcon(self, Icon icon, int x, int y)""" return _gdi_.DC_DrawIcon(*args, **kwargs) - def DrawBitmapXY(*args, **kwargs): - """DrawBitmapXY(self, Bitmap bmp, int x, int y, bool useMask=False)""" - return _gdi_.DC_DrawBitmapXY(*args, **kwargs) + def DrawIconPoint(*args, **kwargs): + """DrawIconPoint(self, Icon icon, Point pt)""" + return _gdi_.DC_DrawIconPoint(*args, **kwargs) def DrawBitmap(*args, **kwargs): - """DrawBitmap(self, Bitmap bmp, Point pt, bool useMask=False)""" + """DrawBitmap(self, Bitmap bmp, int x, int y, bool useMask=False)""" return _gdi_.DC_DrawBitmap(*args, **kwargs) - def DrawTextXY(*args, **kwargs): - """DrawTextXY(self, String text, int x, int y)""" - return _gdi_.DC_DrawTextXY(*args, **kwargs) + def DrawBitmapPoint(*args, **kwargs): + """DrawBitmapPoint(self, Bitmap bmp, Point pt, bool useMask=False)""" + return _gdi_.DC_DrawBitmapPoint(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(self, String text, Point pt)""" + """DrawText(self, String text, int x, int y)""" return _gdi_.DC_DrawText(*args, **kwargs) - def DrawRotatedTextXY(*args, **kwargs): - """DrawRotatedTextXY(self, String text, int x, int y, double angle)""" - return _gdi_.DC_DrawRotatedTextXY(*args, **kwargs) + def DrawTextPoint(*args, **kwargs): + """DrawTextPoint(self, String text, Point pt)""" + return _gdi_.DC_DrawTextPoint(*args, **kwargs) def DrawRotatedText(*args, **kwargs): - """DrawRotatedText(self, String text, Point pt, double angle)""" + """DrawRotatedText(self, String text, int x, int y, double angle)""" return _gdi_.DC_DrawRotatedText(*args, **kwargs) - def BlitXY(*args, **kwargs): + def DrawRotatedTextPoint(*args, **kwargs): + """DrawRotatedTextPoint(self, String text, Point pt, double angle)""" + return _gdi_.DC_DrawRotatedTextPoint(*args, **kwargs) + + def Blit(*args, **kwargs): """ - BlitXY(self, int xdest, int ydest, int width, int height, DC source, + Blit(self, int xdest, int ydest, int width, int height, DC source, int xsrc, int ysrc, int rop=COPY, bool useMask=False, int xsrcMask=-1, int ysrcMask=-1) -> bool """ - return _gdi_.DC_BlitXY(*args, **kwargs) + return _gdi_.DC_Blit(*args, **kwargs) - def Blit(*args, **kwargs): + def BlitPointSize(*args, **kwargs): """ - Blit(self, Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, + BlitPointSize(self, Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, bool useMask=False, Point srcPtMask=DefaultPosition) -> bool """ - return _gdi_.DC_Blit(*args, **kwargs) + return _gdi_.DC_BlitPointSize(*args, **kwargs) + + def SetClippingRegion(*args, **kwargs): + """SetClippingRegion(self, int x, int y, int width, int height)""" + return _gdi_.DC_SetClippingRegion(*args, **kwargs) + + def SetClippingRegionPointSize(*args, **kwargs): + """SetClippingRegionPointSize(self, Point pt, Size sz)""" + return _gdi_.DC_SetClippingRegionPointSize(*args, **kwargs) + + def SetClippingRegionAsRegion(*args, **kwargs): + """SetClippingRegionAsRegion(self, Region region)""" + return _gdi_.DC_SetClippingRegionAsRegion(*args, **kwargs) + + def SetClippingRect(*args, **kwargs): + """SetClippingRect(self, Rect rect)""" + return _gdi_.DC_SetClippingRect(*args, **kwargs) def DrawLines(*args, **kwargs): """DrawLines(self, int points, Point points_array, int xoffset=0, int yoffset=0)""" @@ -2524,22 +2585,6 @@ class DC(_core.Object): """SetPalette(self, Palette palette)""" return _gdi_.DC_SetPalette(*args, **kwargs) - def SetClippingRegionXY(*args, **kwargs): - """SetClippingRegionXY(self, int x, int y, int width, int height)""" - return _gdi_.DC_SetClippingRegionXY(*args, **kwargs) - - def SetClippingRegion(*args, **kwargs): - """SetClippingRegion(self, Point pt, Size sz)""" - return _gdi_.DC_SetClippingRegion(*args, **kwargs) - - def SetClippingRect(*args, **kwargs): - """SetClippingRect(self, Rect rect)""" - return _gdi_.DC_SetClippingRect(*args, **kwargs) - - def SetClippingRegionAsRegion(*args, **kwargs): - """SetClippingRegionAsRegion(self, Region region)""" - return _gdi_.DC_SetClippingRegionAsRegion(*args, **kwargs) - def DestroyClippingRegion(*args, **kwargs): """DestroyClippingRegion(self)""" return _gdi_.DC_DestroyClippingRegion(*args, **kwargs) @@ -2561,12 +2606,7 @@ class DC(_core.Object): return _gdi_.DC_GetCharWidth(*args, **kwargs) def GetTextExtent(*args, **kwargs): - """ - GetTextExtent(wxString string) -> (width, height) - - Get the width and height of the text using the current font. - Only works for single line strings. - """ + """GetTextExtent(wxString string) -> (width, height)""" return _gdi_.DC_GetTextExtent(*args, **kwargs) def GetFullTextExtent(*args, **kwargs): @@ -2574,8 +2614,8 @@ class DC(_core.Object): GetFullTextExtent(wxString string, Font font=None) -> (width, height, descent, externalLeading) - Get the width, height, decent and leading of the text using the current or specified font. - Only works for single line strings. + Get the width, height, decent and leading of the text using the + current or specified font. Only works for single line strings. """ return _gdi_.DC_GetFullTextExtent(*args, **kwargs) @@ -2583,9 +2623,6 @@ class DC(_core.Object): """ GetMultiLineTextExtent(wxString string, Font font=None) -> (width, height, descent, externalLeading) - - Get the width, height, decent and leading of the text using the current or specified font. - Works for single as well as multi-line strings. """ return _gdi_.DC_GetMultiLineTextExtent(*args, **kwargs) @@ -2749,6 +2786,10 @@ class DC(_core.Object): """SetLogicalOrigin(self, int x, int y)""" return _gdi_.DC_SetLogicalOrigin(*args, **kwargs) + def SetLogicalOriginPoint(*args, **kwargs): + """SetLogicalOriginPoint(self, Point point)""" + return _gdi_.DC_SetLogicalOriginPoint(*args, **kwargs) + def GetDeviceOrigin(*args, **kwargs): """GetDeviceOrigin(self) -> Point""" return _gdi_.DC_GetDeviceOrigin(*args, **kwargs) @@ -2761,6 +2802,10 @@ class DC(_core.Object): """SetDeviceOrigin(self, int x, int y)""" return _gdi_.DC_SetDeviceOrigin(*args, **kwargs) + def SetDeviceOriginPoint(*args, **kwargs): + """SetDeviceOriginPoint(self, Point point)""" + return _gdi_.DC_SetDeviceOriginPoint(*args, **kwargs) + def SetAxisOrientation(*args, **kwargs): """SetAxisOrientation(self, bool xLeftRight, bool yBottomUp)""" return _gdi_.DC_SetAxisOrientation(*args, **kwargs) @@ -2785,6 +2830,10 @@ class DC(_core.Object): """CalcBoundingBox(self, int x, int y)""" return _gdi_.DC_CalcBoundingBox(*args, **kwargs) + def CalcBoundingBoxPoint(*args, **kwargs): + """CalcBoundingBoxPoint(self, Point point)""" + return _gdi_.DC_CalcBoundingBoxPoint(*args, **kwargs) + def ResetBoundingBox(*args, **kwargs): """ResetBoundingBox(self)""" return _gdi_.DC_ResetBoundingBox(*args, **kwargs) @@ -3151,12 +3200,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) @@ -3263,246 +3312,6 @@ 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