Reverted to old method names/signatures for wx.DC, updated lib and

demo to match.  Also fixed some deprecation warnings.


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

wxPython/wxPython/_core.py

@@ -645,7 +645,6 @@ wxImageFromMime = wx._core.ImageFromMime
 wxImageFromStream = wx._core.ImageFromStream
 wxImageFromStreamMime = wx._core.ImageFromStreamMime
 wxEmptyImage = wx._core.EmptyImage
-wxEmptyImage = wx._core.EmptyImage
 wxImageFromBitmap = wx._core.ImageFromBitmap
 wxImageFromData = wx._core.ImageFromData
 wxImage_CanRead = wx._core.Image_CanRead

wxPython/wxPython/_gdi.py

@@ -33,12 +33,11 @@ wxBrush = wx._gdi.Brush
 wxBrushPtr = wx._gdi.BrushPtr
 wxBitmap = wx._gdi.Bitmap
 wxBitmapPtr = wx._gdi.BitmapPtr
+wxEmptyBitmap = wx._gdi.EmptyBitmap
 wxBitmapFromIcon = wx._gdi.BitmapFromIcon
 wxBitmapFromImage = wx._gdi.BitmapFromImage
 wxBitmapFromXPMData = wx._gdi.BitmapFromXPMData
 wxBitmapFromBits = wx._gdi.BitmapFromBits
-wxEmptyBitmap = wx._gdi.EmptyBitmap
-wxEmptyBitmap = wx._gdi.EmptyBitmap
 wxMask = wx._gdi.Mask
 wxMaskPtr = wx._gdi.MaskPtr
 wxIcon = wx._gdi.Icon
@@ -576,18 +575,6 @@ wxTheBrushList = wx._gdi.TheBrushList
 wxTheColourDatabase = wx._gdi.TheColourDatabase
 wxEffects = wx._gdi.Effects
 wxEffectsPtr = wx._gdi.EffectsPtr
-wxDC_old = wx._gdi.DC_old
-wxMemoryDC_old = wx._gdi.MemoryDC_old
-wxBufferedDC_old = wx._gdi.BufferedDC_old
-wxBufferedPaintDC_old = wx._gdi.BufferedPaintDC_old
-wxScreenDC_old = wx._gdi.ScreenDC_old
-wxClientDC_old = wx._gdi.ClientDC_old
-wxPaintDC_old = wx._gdi.PaintDC_old
-wxWindowDC_old = wx._gdi.WindowDC_old
-wxMirrorDC_old = wx._gdi.MirrorDC_old
-wxPostScriptDC_old = wx._gdi.PostScriptDC_old
-wxMetaFileDC_old = wx._gdi.MetaFileDC_old
-wxPrinterDC_old = wx._gdi.PrinterDC_old
 wxMaskColour = wx._gdi.MaskColour
 
 

wxPython/wxPython/_wx.py

@@ -35,21 +35,3 @@ def wxPyTypeCast(obj, typeStr):
 wxPy_isinstance = isinstance
 
 
-
-# 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.
-
-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          
-