Merge pull request #10609 from anntzer/wxmorecleanup

DietmarSchwertberger · web-flow · commit 1d73e7338c08 · 2018-03-20T18:03:46.000+01:00
More wx cleanup.
diff --git a/doc/api/next_api_changes/2018-02-15-AL-deprecations.rst b/doc/api/next_api_changes/2018-02-15-AL-deprecations.rst
@@ -16,6 +16,7 @@ The following classes, methods, functions, and attributes are deprecated:
 - ``dates.DateFormatter.strftime_pre_1900``, ``dates.DateFormatter.strftime``,
 - ``font_manager.TempCache``,
 - ``mathtext.unichr_safe`` (use ``chr`` instead),
+- ``FigureCanvasWx.macros``,
 - ``texmanager.dvipng_hack_alpha``,
 
 The following rcParams are deprecated:
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -13,8 +13,6 @@
  should be included with this source code.
 
 """
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
 
 import six
 
@@ -606,30 +604,11 @@ def __init__(self, parent, id, figure):
         # Set preferred window size hint - helps the sizer (if one is
         # connected)
         l, b, w, h = figure.bbox.bounds
-        w = int(math.ceil(w))
-        h = int(math.ceil(h))
+        w = math.ceil(w)
+        h = math.ceil(h)
 
         wx.Panel.__init__(self, parent, id, size=wx.Size(w, h))
 
-        def do_nothing(*args, **kwargs):
-            warnings.warn(
-                "could not find a setinitialsize function for backend_wx; "
-                "please report your wxpython version=%s "
-                "to the matplotlib developers list" %
-                wxc.backend_version)
-            pass
-
-        # try to find the set size func across wx versions
-        try:
-            getattr(self, 'SetInitialSize')
-        except AttributeError:
-            self.SetInitialSize = getattr(self, 'SetBestFittingSize',
-                                          do_nothing)
-
-        if not hasattr(self, 'IsShownOnScreen'):
-            self.IsShownOnScreen = getattr(self, 'IsVisible',
-                                           lambda *args: True)
-
         # Create the drawing bitmap
         self.bitmap = wxc.EmptyBitmap(w, h)
         DEBUG_MSG("__init__() - bitmap w:%d h:%d" % (w, h), 2, self)
@@ -661,7 +640,10 @@ def do_nothing(*args, **kwargs):
         self.SetBackgroundStyle(wx.BG_STYLE_PAINT)  # Reduce flicker.
         self.SetBackgroundColour(wx.WHITE)
 
-        self.macros = {}  # dict from wx id to seq of macros
+    @property
+    @cbook.deprecated("3.0")
+    def macros(self):
+        return {}
 
     def Destroy(self, *args, **kwargs):
         wx.Panel.Destroy(self, *args, **kwargs)
@@ -1082,8 +1064,8 @@ def _print_image(self, filename, filetype, *args, **kwargs):
         origBitmap = self.bitmap
 
         l, b, width, height = self.figure.bbox.bounds
-        width = int(math.ceil(width))
-        height = int(math.ceil(height))
+        width = math.ceil(width)
+        height = math.ceil(height)
 
         self.bitmap = wxc.EmptyBitmap(width, height)
 
