reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/gtk/_core.py

@@ -5060,40 +5060,45 @@ class App(wx.PyApp):
 
     Every application must have a ``wx.App`` instance, and all
     creation of UI objects should be delayed until after the
-    ``wx.App`` object has been created in order to ensure that the
+    ``wx.App`` object has been created in order to ensure that the gui
-    gui platform and wxWidgets have been fully initialized.
+    platform and wxWidgets have been fully initialized.
 
     Normally you would derive from this class and implement an
     ``OnInit`` method that creates a frame and then calls
     ``self.SetTopWindow(frame)``.
 
-    :see: `wx.PySimpleApp` for a simpler app class that can be used directly.
+    :see: `wx.PySimpleApp` for a simpler app class that can be used
+    directly.
     """
     
     outputWindowClass = PyOnDemandOutputWindow
 
-    def __init__(self, redirect=_defRedirect, filename=None, useBestVisual=False):
+    def __init__(self, redirect=_defRedirect, filename=None,
+                 useBestVisual=False, clearSigInt=True):
         """
         Construct a ``wx.App`` object.  
 
-        :param redirect: Should ``sys.stdout`` and ``sys.stderr``
+        :param redirect: Should ``sys.stdout`` and ``sys.stderr`` be
-            be redirected?  Defaults to True on Windows and Mac,
+            redirected?  Defaults to True on Windows and Mac, False
-            False otherwise.  If `filename` is None then output
+            otherwise.  If `filename` is None then output will be
-            will be redirected to a window that pops up as
+            redirected to a window that pops up as needed.  (You can
-            needed.  (You can control what kind of window is
+            control what kind of window is created for the output by
-            created for the output by resetting the class
+            resetting the class variable ``outputWindowClass`` to a
-            variable ``outputWindowClass`` to a class of your
+            class of your choosing.)
-            choosing.)
 
-        :param filename: The name of a file to redirect output
+        :param filename: The name of a file to redirect output to, if
-            to, if redirect is True.
+            redirect is True.
 
         :param useBestVisual: Should the app try to use the best
-            available visual provided by the system (only
+            available visual provided by the system (only relevant on
-            relevant on systems that have more than one visual.)
+            systems that have more than one visual.)  This parameter
-            This parameter must be used instead of calling
+            must be used instead of calling `SetUseBestVisual` later
-            `SetUseBestVisual` later on because it must be set
+            on because it must be set before the underlying GUI
-            before the underlying GUI toolkit is initialized.
+            toolkit is initialized.
+
+        :param clearSigInt: Should SIGINT be cleared?  This allows the
+            app to terminate upon a Ctrl-C in the console like other
+            GUI apps will.
 
         :note: You should override OnInit to do applicaition
             initialization to ensure that the system, toolkit and
@@ -5122,6 +5127,7 @@ your Mac."""
         # KeyboardInterrupt???)  but will later segfault on exit.  By
         # setting the default handler then the app will exit, as
         # expected (depending on platform.)
+        if clearSigInt:
             try:
                 import signal
                 signal.signal(signal.SIGINT, signal.SIG_DFL)
@@ -5202,11 +5208,12 @@ class PySimpleApp(wx.App):
     :see: `wx.App` 
     """
 
-    def __init__(self, redirect=False, filename=None, useBestVisual=False):
+    def __init__(self, redirect=False, filename=None,
+                 useBestVisual=False, clearSigInt=True):
         """
         :see: `wx.App.__init__`
         """
-        wx.App.__init__(self, redirect, filename, useBestVisual)
+        wx.App.__init__(self, redirect, filename, useBestVisual, clearSigInt)
         
     def OnInit(self):
         wx.InitAllImageHandlers()

wxPython/src/gtk/_core_wrap.cpp

@@ -1663,21 +1663,27 @@ PyObject *wxSizer_GetChildren(wxSizer *self){
             return wxPy_ConvertList(&list);
         }
 void wxSizer_Show(wxSizer *self,PyObject *item,bool show){
+            bool blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False);
+            wxPyEndBlockThreads(blocked);
             if ( info.window )
                 self->Show(info.window, show);
             else if ( info.sizer )
                 self->Show(info.sizer, show);
         }
 void wxSizer_Hide(wxSizer *self,PyObject *item){
+            bool blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False);
+            wxPyEndBlockThreads(blocked);
             if ( info.window )
                 self->Hide(info.window);
             else if ( info.sizer )
                 self->Hide(info.sizer);
         }
 bool wxSizer_IsShown(wxSizer *self,PyObject *item){
+            bool blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, False);
+            wxPyEndBlockThreads(blocked);
             if ( info.window ) 
                 return self->IsShown(info.window);
             else if ( info.sizer ) 

wxPython/src/gtk/_gdi.py

@@ -2410,161 +2410,177 @@ 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):
+    def FloodFillPoint(*args, **kwargs):
-        """GetPixelXY(self, int x, int y) -> Colour"""
+        """FloodFillPoint(self, Point pt, Colour col, int style=FLOOD_SURFACE) -> bool"""
-        return _gdi_.DC_GetPixelXY(*args, **kwargs)
+        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):
+    def GetPixelPoint(*args, **kwargs):
-        """DrawLineXY(self, int x1, int y1, int x2, int y2)"""
+        """GetPixelPoint(self, Point pt) -> Colour"""
-        return _gdi_.DC_DrawLineXY(*args, **kwargs)
+        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):
+    def DrawLinePoint(*args, **kwargs):
-        """CrossHairXY(self, int x, int y)"""
+        """DrawLinePoint(self, Point pt1, Point pt2)"""
-        return _gdi_.DC_CrossHairXY(*args, **kwargs)
+        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):
+    def CrossHairPoint(*args, **kwargs):
-        """DrawArcXY(self, int x1, int y1, int x2, int y2, int xc, int yc)"""
+        """CrossHairPoint(self, Point pt)"""
-        return _gdi_.DC_DrawArcXY(*args, **kwargs)
+        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):
+    def DrawArcPoint(*args, **kwargs):
-        """DrawCheckMarkXY(self, int x, int y, int width, int height)"""
+        """DrawArcPoint(self, Point pt1, Point pt2, Point centre)"""
-        return _gdi_.DC_DrawCheckMarkXY(*args, **kwargs)
+        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):
+    def DrawCheckMarkRect(*args, **kwargs):
-        """DrawEllipticArcXY(self, int x, int y, int w, int h, double sa, double ea)"""
+        """DrawCheckMarkRect(self, Rect rect)"""
-        return _gdi_.DC_DrawEllipticArcXY(*args, **kwargs)
+        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):
+    def DrawEllipticArcPointSize(*args, **kwargs):
-        """DrawPointXY(self, int x, int y)"""
+        """DrawEllipticArcPointSize(self, Point pt, Size sz, double sa, double ea)"""
-        return _gdi_.DC_DrawPointXY(*args, **kwargs)
+        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):
+    def DrawPointPoint(*args, **kwargs):
-        """DrawRectangleXY(self, int x, int y, int width, int height)"""
+        """DrawPointPoint(self, Point pt)"""
-        return _gdi_.DC_DrawRectangleXY(*args, **kwargs)
+        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):
+    def DrawRectanglePointSize(*args, **kwargs):
-        """DrawRoundedRectangleXY(self, int x, int y, int width, int height, double radius)"""
+        """DrawRectanglePointSize(self, Point pt, Size sz)"""
-        return _gdi_.DC_DrawRoundedRectangleXY(*args, **kwargs)
+        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):
+    def DrawRoundedRectanglePointSize(*args, **kwargs):
-        """DrawCircleXY(self, int x, int y, int radius)"""
+        """DrawRoundedRectanglePointSize(self, Point pt, Size sz, double radius)"""
-        return _gdi_.DC_DrawCircleXY(*args, **kwargs)
+        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):
+    def DrawCirclePoint(*args, **kwargs):
-        """DrawEllipseXY(self, int x, int y, int width, int height)"""
+        """DrawCirclePoint(self, Point pt, int radius)"""
-        return _gdi_.DC_DrawEllipseXY(*args, **kwargs)
+        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):
+    def DrawEllipsePointSize(*args, **kwargs):
-        """DrawIconXY(self, Icon icon, int x, int y)"""
+        """DrawEllipsePointSize(self, Point pt, Size sz)"""
-        return _gdi_.DC_DrawIconXY(*args, **kwargs)
+        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):
+    def DrawIconPoint(*args, **kwargs):
-        """DrawBitmapXY(self, Bitmap bmp, int x, int y, bool useMask=False)"""
+        """DrawIconPoint(self, Icon icon, Point pt)"""
-        return _gdi_.DC_DrawBitmapXY(*args, **kwargs)
+        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):
+    def DrawBitmapPoint(*args, **kwargs):
-        """DrawTextXY(self, String text, int x, int y)"""
+        """DrawBitmapPoint(self, Bitmap bmp, Point pt, bool useMask=False)"""
-        return _gdi_.DC_DrawTextXY(*args, **kwargs)
+        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):
+    def DrawTextPoint(*args, **kwargs):
-        """DrawRotatedTextXY(self, String text, int x, int y, double angle)"""
+        """DrawTextPoint(self, String text, Point pt)"""
-        return _gdi_.DC_DrawRotatedTextXY(*args, **kwargs)
+        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)"""
-        BlitXY(self, int xdest, int ydest, int width, int height, DC source, 
+        return _gdi_.DC_DrawRotatedTextPoint(*args, **kwargs)
-            int xsrc, int ysrc, int rop=COPY, bool useMask=False, 
-            int xsrcMask=-1, int ysrcMask=-1) -> bool
-        """
-        return _gdi_.DC_BlitXY(*args, **kwargs)
 
     def Blit(*args, **kwargs):
         """
-        Blit(self, Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, 
+        Blit(self, int xdest, int ydest, int width, int height, DC source, 
-            bool useMask=False, Point srcPtMask=DefaultPosition) -> bool
+            int xsrc, int ysrc, int rop=COPY, bool useMask=False, 
+            int xsrcMask=-1, int ysrcMask=-1) -> bool
         """
         return _gdi_.DC_Blit(*args, **kwargs)
 
+    def BlitPointSize(*args, **kwargs):
+        """
+        BlitPointSize(self, Point destPt, Size sz, DC source, Point srcPt, int rop=COPY, 
+            bool useMask=False, Point srcPtMask=DefaultPosition) -> bool
+        """
+        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)"""
         return _gdi_.DC_DrawLines(*args, **kwargs)
@@ -2638,22 +2654,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)
@@ -2863,6 +2863,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 +2879,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 +2907,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 +3358,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

wxPython/src/gtk/_windows.py

@@ -1938,8 +1938,8 @@ EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
 class ColourData(_core.Object):
     """
     This class holds a variety of information related to the colour
-    chooser dialog.  This class is used to transfer settings and results
+    chooser dialog, used to transfer settings and results to and from the
-    to and from the `wx.ColourDialog`.
+    `wx.ColourDialog`.
     """
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxColourData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)