Merge pull request #25192 from dstansby/wx-canvas

timhoffm · web-flow · commit 238e275b2f93 · 2023-02-18T18:48:26.000+01:00
Expire wx canvas param deprecation
diff --git a/doc/api/next_api_changes/behavior/25192-DS.rst b/doc/api/next_api_changes/behavior/25192-DS.rst
@@ -0,0 +1,4 @@
+``canvas`` argument now required for ``FigureFrameWx``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``FigureFrameWx`` now requires a keyword-only ``canvas`` argument
+when it is constructed.
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -902,7 +902,7 @@ def _print_image(self, filetype, filename):
 
 
 class FigureFrameWx(wx.Frame):
-    def __init__(self, num, fig, *, canvas_class=None):
+    def __init__(self, num, fig, *, canvas_class):
         # On non-Windows platform, explicitly set the position - fix
         # positioning bug on some Linux platforms
         if wx.Platform == '__WXMSW__':
@@ -914,16 +914,7 @@ def __init__(self, num, fig, *, canvas_class=None):
         _log.debug("%s - __init__()", type(self))
         _set_frame_icon(self)
 
-        # The parameter will become required after the deprecation elapses.
-        if canvas_class is not None:
-            self.canvas = canvas_class(self, -1, fig)
-        else:
-            _api.warn_deprecated(
-                "3.6", message="The canvas_class parameter will become "
-                "required after the deprecation period starting in Matplotlib "
-                "%(since)s elapses.")
-            self.canvas = self.get_canvas(fig)
-
+        self.canvas = canvas_class(self, -1, fig)
         # Auto-attaches itself to self.canvas.manager
         manager = FigureManagerWx(self.canvas, num, self)
 
