Added a set of 2.4 compatibility classes for the wxDC classes that

replaces the normal Draw methods with those that have 2.4 compatible
parameter lists.  These classes are used by default only when
importing from wxPython.wx (the "old" namespace.)


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

wxPython/docs/MigrationGuide.txt

@@ -281,13 +281,14 @@ that are affected are listed here::
     SetClippingRegionAsRegion(region);
 
 	
-If you have code that draws on a DC you **will** get errors because of
-these changes, but it should be easy to fix the code.  You can either
-change the name of the *Type B* method called to the names shown
-above, or just add parentheses around the parameters as needed to turn
-them into tuples and let the SWIG typemaps turn them into the wx.Point
-or wx.Size object that is expected.  Then you will be calling the new
-*Type A* method.  For example, if you had this code before::
+If you have code that draws on a DC and you are using the new wx
+namespace then you **will** get errors because of these changes, but
+it should be easy to fix the code.  You can either change the name of
+the *Type B* method called to the names shown above, or just add
+parentheses around the parameters as needed to turn them into tuples
+and let the SWIG typemaps turn them into the wx.Point or wx.Size
+object that is expected.  Then you will be calling the new *Type A*
+method.  For example, if you had this code before::
 
     dc.DrawRectangle(x, y, width, height)
 
@@ -305,6 +306,14 @@ Then you can just simplify it like this::
 
     dc.DrawRectangle(p, s)
 
+Now before you start yelling and screaming at me for breaking all your
+code, take note that I said above "...using the new wx namespace..."
+That's because if you are still importing from wxPython.wx then there
+are some classes defined there with Draw and etc. methods that have
+2.4 compatible signatures.  However if/when the old wxPython.wx
+namespace is removed then these classes will be removed too so you
+should plam on migrating to the new namespace and new DC Draw methods
+before that time.
 
 
 

wxPython/src/_dc.i

@@ -13,6 +13,7 @@
 // Not a %module
 
 
+
 //---------------------------------------------------------------------------
 
 %{
@@ -52,7 +53,7 @@ public:
 
 
 
-#if 0  // The old way
+#if defined(wxUSE_DC_OLD_METHODS)
 
     bool FloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE);
     //bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const;
@@ -486,8 +487,8 @@ public:
 
 
     def DrawPolygonList(self, polygons, pens=None, brushes=None):
-        ## Note: This does not currently support fill style or offset
-        ## you can always use the non-List version if need be.
+        %## Note: This does not currently support fill style or offset
+        %## you can always use the non-List version if need be.
         if pens is None:
            pens = []
         elif isinstance(pens, wx.Pen):
@@ -504,9 +505,9 @@ public:
 
 
     def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):
-        ## NOTE: this does not currently support changing the font
-        ##       Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
-        ##       If you want backgounds to do anything.
+        %## NOTE: this does not currently support changing the font
+        %##       Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
+        %##       If you want backgounds to do anything.
         if type(textList) == type(''):
            textList = [textList]
         elif len(textList) != len(coords):
@@ -769,4 +770,49 @@ public:
 };
 #endif
 
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+// Now define some Python classes that rename the Draw methods to be
+// compatible with the DC Draw methods in 2.4.  See also wxPython/_wx.py.
+
+
+%define MAKE_OLD_DC_CLASS(classname)
+    %pythoncode {
+    class classname##_old(classname):
+        """DC class that has methods with 2.4 compatible parameters."""
+        FloodFill = classname.FloodFillXY
+        GetPixel = classname.GetPixelXY
+        DrawLine = classname.DrawLineXY
+        CrossHair = classname.CrossHairXY
+        DrawArc = classname.DrawArcXY
+        DrawCheckMark = classname.DrawCheckMarkXY
+        DrawEllipticArc = classname.DrawEllipticArcXY
+        DrawPoint = classname.DrawPointXY
+        DrawRectangle = classname.DrawRectangleXY
+        DrawRoundedRectangle = classname.DrawRoundedRectangleXY
+        DrawCircle = classname.DrawCircleXY
+        DrawEllipse = classname.DrawEllipseXY
+        DrawIcon = classname.DrawIconXY
+        DrawBitmap = classname.DrawBitmapXY
+        DrawText = classname.DrawTextXY
+        DrawRotatedText = classname.DrawRotatedTextXY
+        Blit = classname.BlitXY
+    }
+%enddef
+
+MAKE_OLD_DC_CLASS(DC);
+MAKE_OLD_DC_CLASS(MemoryDC);
+MAKE_OLD_DC_CLASS(BufferedDC);
+MAKE_OLD_DC_CLASS(BufferedPaintDC);
+MAKE_OLD_DC_CLASS(ScreenDC);
+MAKE_OLD_DC_CLASS(ClientDC);
+MAKE_OLD_DC_CLASS(PaintDC);
+MAKE_OLD_DC_CLASS(WindowDC);
+MAKE_OLD_DC_CLASS(MirrorDC);
+MAKE_OLD_DC_CLASS(PostScriptDC);
+MAKE_OLD_DC_CLASS(MetaFileDC);
+MAKE_OLD_DC_CLASS(PrinterDC);
+
+
 //---------------------------------------------------------------------------

wxPython/src/_gdi_reverse.txt

@@ -1,7 +1,18 @@
 # Other names that need to be reverse-renamed for the old namespace
 
 
-#Color
-#NamedColor
+DC_old
+MemoryDC_old
+BufferedDC_old
+BufferedPaintDC_old
+ScreenDC_old
+ClientDC_old
+PaintDC_old
+WindowDC_old
+MirrorDC_old
+PostScriptDC_old
+MetaFileDC_old
+PrinterDC_old
+
 
 

wxPython/wxPython/_wx.py

@@ -35,28 +35,23 @@ def wxPyTypeCast(obj, typeStr):
 wxPy_isinstance = isinstance
 
 
-# To get wxDC methods compatible with the old 2.4 wxDC uncomment these
-# lines.  Note however that doing this will break any code that
-# expects the new-style methods.  (Is there a way to do this that does
-# not have that problem?  I suppose we could provide two versions of
-# the DC classes and just rename them here...)
 
-#wxDC.FloodFill = wxDC.FloodFillXY
-#wxDC.GetPixel = wxDC.GetPixelXY
-#wxDC.DrawLine = wxDC.DrawLineXY
-#wxDC.CrossHair = wxDC.CrossHairXY
-#wxDC.DrawArc = wxDC.DrawArcXY
-#wxDC.DrawCheckMark = wxDC.DrawCheckMarkXY
-#wxDC.DrawEllipticArc = wxDC.DrawEllipticArcXY
-#wxDC.DrawPoint = wxDC.DrawPointXY
-#wxDC.DrawRectangle = wxDC.DrawRectangleXY
-#wxDC.DrawRoundedRectangle = wxDC.DrawRoundedRectangleXY
-#wxDC.DrawCircle = wxDC.DrawCircleXY
-#wxDC.DrawEllipse = wxDC.DrawEllipseXY
-#wxDC.DrawIcon = wxDC.DrawIconXY
-#wxDC.DrawBitmap = wxDC.DrawBitmapXY
-#wxDC.DrawText = wxDC.DrawTextXY
-#wxDC.DrawRotatedText = wxDC.DrawRotatedTextXY
-#wxDC.Blit = wxDC.BlitXY
-#wxDC.SetClippingRegion = wxDC.SetClippingRegionXY 
+# The wx*DC_old classes have Draw* method signatures that are mostly
+# compatible with 2.4, so assign the new classes to wx*DC_new and make
+# the _old classes be the defaults with the normal names.
+
+# Too bad it doesn't currently work...
+
+wxDC_new = wxDC; wxDC = wxDC_old                 
+wxMemoryDC_new = wxMemoryDC; wxMemoryDC = wxMemoryDC_old           
+wxBufferedDC_new = wxBufferedDC; wxBufferedDC = wxBufferedDC_old         
+wxBufferedPaintDC_new = wxBufferedPaintDC; wxBufferedPaintDC = wxBufferedPaintDC_old    
+wxScreenDC_new = wxScreenDC; wxScreenDC = wxScreenDC_old           
+wxClientDC_new = wxClientDC; wxClientDC = wxClientDC_old           
+wxPaintDC_new = wxPaintDC; wxPaintDC = wxPaintDC_old            
+wxWindowDC_new = wxWindowDC; wxWindowDC = wxWindowDC_old           
+wxMirrorDC_new = wxMirrorDC; wxMirrorDC = wxMirrorDC_old           
+wxPostScriptDC_new = wxPostScriptDC; wxPostScriptDC = wxPostScriptDC_old       
+wxMetaFileDC_new = wxMetaFileDC; wxMetaFileDC = wxMetaFileDC_old         
+wxPrinterDC_new = wxPrinterDC; wxPrinterDC = wxPrinterDC_old