Merge pull request matplotlib#4594 from jenshnielsen/fixwx

tacaswell · tacaswell · commit b400edbf95c5 · 2015-07-06T17:14:01.000-04:00
Revert "WX Monkey patch ClientDC for name changes"
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -832,7 +832,7 @@ def gui_repaint(self, drawDC=None, origin='WX'):
         if self.IsShownOnScreen():
             if not drawDC:
                 # not called from OnPaint use a ClientDC
-                drawDC = wxc.ClientDC(self)
+                drawDC = wx.ClientDC(self)
 
             # ensure that canvas has no 'left' over stuff when resizing frame
             drawDC.Clear()
@@ -1688,7 +1688,7 @@ def release(self, event):
     def draw_rubberband(self, event, x0, y0, x1, y1):
         # Use an Overlay to draw a rubberband-like bounding box.
 
-        dc = wxc.ClientDC(self.canvas)
+        dc = wx.ClientDC(self.canvas)
         odc = wx.DCOverlay(self.wxoverlay, dc)
         odc.Clear()
 
@@ -1721,7 +1721,10 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
         r, g, b, a = color.Get(True)
         color.Set(r, g, b, 0x60)
         dc.SetBrush(wx.Brush(color))
-        dc.DrawRectangleRect(rect)
+        if wxc.is_phoenix:
+            dc.DrawRectangle(rect)
+        else:
+            dc.DrawRectangleRect(rect)
 
     def set_status_bar(self, statbar):
         self.statbar = statbar
diff --git a/lib/matplotlib/backends/wx_compat.py b/lib/matplotlib/backends/wx_compat.py
@@ -28,9 +28,6 @@
     print(" wxPython version %s was imported." % backend_version)
     raise ImportError(missingwx)
 
-# Import ClientCD so we can Monkey patch it.
-ClientDC = wx.ClientDC
-
 if is_phoenix:
     # define all the wxPython phoenix stuff
 
@@ -86,8 +83,6 @@
     NamedColour = wx.Colour
     StockCursor = wx.Cursor
 
-    # Moneypatch ClientDC to for rename of DrawRectangleRect to DrawRectangle
-    ClientDC.DrawRectangleRect = ClientDC.DrawRectangle
 else:
     # define all the wxPython classic stuff
 
