Merge pull request matplotlib#4554 from jenshnielsen/nowxversion

A few WX phoenix related changes

Author: WeatherGod

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 = wx.ClientDC(self)
+                drawDC = wxc.ClientDC(self)
 
             # ensure that canvas has no 'left' over stuff when resizing frame
             drawDC.Clear()
@@ -1687,7 +1687,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 = wx.ClientDC(self.canvas)
+        dc = wxc.ClientDC(self.canvas)
         odc = wx.DCOverlay(self.wxoverlay, dc)
         odc.Clear()
 
@@ -1713,7 +1713,7 @@ def draw_rubberband(self, event, x0, y0, x1, y1):
         rubberBandColor = '#C0C0FF'  # or load from config?
 
         # Set a pen for the border
-        color = wx.NamedColour(rubberBandColor)
+        color = wxc.NamedColour(rubberBandColor)
         dc.SetPen(wx.Pen(color, 1))
 
         # use the same color, plus alpha for the brush

lib/matplotlib/backends/wx_compat.py

@@ -28,6 +28,9 @@
     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
 
@@ -83,6 +86,8 @@
     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
 

setupext.py

@@ -1849,20 +1849,22 @@ class BackendWxAgg(OptionalBackendPackage):
     name = "wxagg"
 
     def check_requirements(self):
+        wxversioninstalled = True
         try:
             import wxversion
         except ImportError:
-            raise CheckFailed("requires wxPython")
+            wxversioninstalled = False
 
-        try:
-            _wx_ensure_failed = wxversion.AlreadyImportedError
-        except AttributeError:
-            _wx_ensure_failed = wxversion.VersionError
+        if wxversioninstalled:
+            try:
+                _wx_ensure_failed = wxversion.AlreadyImportedError
+            except AttributeError:
+                _wx_ensure_failed = wxversion.VersionError
 
-        try:
-            wxversion.ensureMinimal('2.8')
-        except _wx_ensure_failed:
-            pass
+            try:
+                wxversion.ensureMinimal('2.8')
+            except _wx_ensure_failed:
+                pass
 
         try:
             import wx