]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/gtk/_gdi.py
reSWIGged
[wxWidgets.git] / wxPython / src / gtk / _gdi.py
index 633fe02561dc1dfe5dfe5c7f6f4d51fc90f6f083..99e085bb2528e0db4712ce629757b3a91323ac90 100644 (file)
@@ -46,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
@@ -82,7 +88,7 @@ class Colour(_core.Object):
 
     def Red(*args, **kwargs):
         """
-        Red(self) -> unsigned char
+        Red(self) -> byte
 
         Returns the red intensity.
         """
@@ -90,7 +96,7 @@ class Colour(_core.Object):
 
     def Green(*args, **kwargs):
         """
-        Green(self) -> unsigned char
+        Green(self) -> byte
 
         Returns the green intensity.
         """
@@ -98,7 +104,7 @@ class Colour(_core.Object):
 
     def Blue(*args, **kwargs):
         """
-        Blue(self) -> unsigned char
+        Blue(self) -> byte
 
         Returns the blue intensity.
         """
@@ -115,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.
         """
@@ -133,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)
 
@@ -142,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)
 
@@ -179,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())
@@ -198,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
@@ -361,18 +369,6 @@ class Brush(GDIObject):
     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.
-
-    :warning: Do not create instances of wx.Brush before the `wx.App`
-        object has been created because, depending on the platform,
-        required internal data structures may not have been initialized
-        yet.  Instead create your brushes in the app's OnInit or as they
-        are needed for drawing.
-
-    :note: On monochrome displays all brushes are white, unless the colour
-        really is black.
-
-    :see: `wx.BrushList`, `wx.DC`, `wx.DC.SetBrush`
-
     """
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBrush instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -380,24 +376,7 @@ class Brush(GDIObject):
         """
         __init__(self, Colour colour, int style=SOLID) -> Brush
 
-        Constructs a brush from a `wx.Colour` object and a style.  The style
-        parameter may be one of the following:
-
-            ===================   =============================
-            Style                 Meaning
-            ===================   =============================
-            wx.TRANSPARENT        Transparent (no fill).
-            wx.SOLID              Solid.
-            wx.STIPPLE            Uses a bitmap as a stipple.
-            wx.BDIAGONAL_HATCH    Backward diagonal hatch.
-            wx.CROSSDIAG_HATCH    Cross-diagonal hatch.
-            wx.FDIAGONAL_HATCH    Forward diagonal hatch.
-            wx.CROSS_HATCH        Cross hatch.
-            wx.HORIZONTAL_HATCH   Horizontal hatch.
-            wx.VERTICAL_HATCH     Vertical hatch.
-            ===================   =============================
-
-
+        Constructs a brush from a `wx.Colour` object and a style.
         """
         newobj = _gdi_.new_Brush(*args, **kwargs)
         self.this = newobj.this
@@ -485,19 +464,6 @@ class Bitmap(GDIObject):
     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.
-
-    The BMP and XMP image file formats are supported on all platforms by
-    wx.Bitmap.  Other formats are automatically loaded by `wx.Image` and
-    converted to a wx.Bitmap, so any image file format supported by
-    `wx.Image` can be used.
-
-    :todo: Add wrappers and support for raw bitmap data access.  Can this
-           be be put into Python without losing the speed benefits of the
-           teplates and iterators in rawbmp.h?
-
-    :todo: Find a way to do very efficient PIL Image <--> wx.Bitmap
-           converstions.
-
     """
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxBitmap instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -506,33 +472,6 @@ class Bitmap(GDIObject):
         __init__(self, String name, int type=BITMAP_TYPE_ANY) -> Bitmap
 
         Loads a bitmap from a file.
-
-        :param name:  Name of the file to load the bitmap from.
-        :param type: The type of image to expect.  Can be one of the following
-            constants (assuming that the neccessary `wx.Image` handlers are
-            loaded):
-
-                * wx.BITMAP_TYPE_ANY
-                * wx.BITMAP_TYPE_BMP
-                * wx.BITMAP_TYPE_ICO
-                * wx.BITMAP_TYPE_CUR
-                * wx.BITMAP_TYPE_XBM
-                * wx.BITMAP_TYPE_XPM
-                * wx.BITMAP_TYPE_TIF
-                * wx.BITMAP_TYPE_GIF
-                * wx.BITMAP_TYPE_PNG
-                * wx.BITMAP_TYPE_JPEG
-                * wx.BITMAP_TYPE_PNM
-                * wx.BITMAP_TYPE_PCX
-                * wx.BITMAP_TYPE_PICT
-                * wx.BITMAP_TYPE_ICON
-                * wx.BITMAP_TYPE_ANI
-                * wx.BITMAP_TYPE_IFF
-
-        :see: Alternate constructors `wx.EmptyBitmap`, `wx.BitmapFromIcon`,
-              `wx.BitmapFromImage`, `wx.BitmapFromXPMData`,
-              `wx.BitmapFromBits`
-
         """
         newobj = _gdi_.new_Bitmap(*args, **kwargs)
         self.this = newobj.this
@@ -773,7 +712,6 @@ class Mask(_core.Object):
     `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,)
@@ -979,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,)
@@ -996,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
@@ -1029,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
@@ -1040,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
@@ -1161,9 +1092,13 @@ class Region(GDIObject):
         return _gdi_.Region_ConvertToBitmap(*args, **kwargs)
 
     def UnionBitmap(*args, **kwargs):
-        """UnionBitmap(self, Bitmap bmp, Colour transColour=NullColour, int tolerance=0) -> bool"""
+        """UnionBitmap(self, Bitmap bmp) -> bool"""
         return _gdi_.Region_UnionBitmap(*args, **kwargs)
 
+    def UnionBitmapColour(*args, **kwargs):
+        """UnionBitmapColour(self, Bitmap bmp, Colour transColour, int tolerance=0) -> bool"""
+        return _gdi_.Region_UnionBitmapColour(*args, **kwargs)
+
 
 class RegionPtr(Region):
     def __init__(self, this):
@@ -1173,11 +1108,17 @@ class RegionPtr(Region):
 _gdi_.Region_swigregister(RegionPtr)
 
 def RegionFromBitmap(*args, **kwargs):
-    """RegionFromBitmap(Bitmap bmp, Colour transColour=NullColour, int tolerance=0) -> Region"""
+    """RegionFromBitmap(Bitmap bmp) -> Region"""
     val = _gdi_.new_RegionFromBitmap(*args, **kwargs)
     val.thisown = 1
     return val
 
+def RegionFromBitmapColour(*args, **kwargs):
+    """RegionFromBitmapColour(Bitmap bmp, Colour transColour, int tolerance=0) -> Region"""
+    val = _gdi_.new_RegionFromBitmapColour(*args, **kwargs)
+    val.thisown = 1
+    return val
+
 def RegionFromPoints(*args, **kwargs):
     """RegionFromPoints(int points, Point points_array, int fillStyle=WINDING_RULE) -> Region"""
     val = _gdi_.new_RegionFromPoints(*args, **kwargs)
@@ -1663,6 +1604,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
@@ -1810,12 +1752,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
@@ -1825,6 +1769,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
@@ -2144,7 +2089,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
@@ -2371,16 +2316,7 @@ def EncodingConverter_CanConvert(*args, **kwargs):
     return _gdi_.EncodingConverter_CanConvert(*args, **kwargs)
 
 #----------------------------------------------------------------------------
-# wxGTK sets the locale when initialized.  Doing this at the Python
-# level should set it up to match what GTK is doing at the C level.
-if wx.Platform == "__WXGTK__":
-    try:
-        import locale
-        locale.setlocale(locale.LC_ALL, "")
-    except:
-        pass
-
-# On MSW add the directory where the wxWindows catalogs were installed
+# On MSW add the directory where the wxWidgets catalogs were installed
 # to the default catalog path.
 if wx.Platform == "__WXMSW__":
     import os
@@ -2410,160 +2346,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)"""
@@ -2638,22 +2590,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)
@@ -2675,12 +2611,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):
@@ -2688,8 +2619,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)
 
@@ -2697,9 +2628,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)
 
@@ -2863,6 +2791,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)
@@ -2875,6 +2807,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)
@@ -2899,6 +2835,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)
@@ -3346,246 +3286,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