More wx cleanup.

anntzer · anntzer · commit 6f358b200c02 · 2018-02-26T01:10:48.000-08:00
1) math.ceil() returns an int on Py3. 2) Window.SetInitialSize and Window.IsShownOnScreen are documented in the wx API; it seems overkill to try to workaround their possible absence (that code was present from the very beginning of the git history). 3) the macros attribute is unused since 7499f7c (2004).
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
@@ -6,3 +6,4 @@ The following functions and classes are deprecated:
   ``get_realpath_and_stat``),
 - ``cbook.is_numlike`` (use ``isinstance(..., numbers.Number)`` instead),
 - ``mathtext.unichr_safe`` (use ``chr`` instead),
+- ``FigureCanvasWx.macros``,
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
 
@@ -627,30 +625,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)
@@ -682,7 +661,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)
@@ -1098,8 +1080,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)
 
