fix for non-toolmanager use of Wx backends; set frame icon for subplot tool

DietmarSchwertberger · DietmarSchwertberger · commit 5bd1d761d089 · 2018-04-26T20:27:16.000+02:00
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1284,7 +1284,7 @@ def __init__(self, canvas, num, frame):
         self.frame = frame
         self.window = frame
 
-        self.toolmanager = frame.toolmanager
+        self.toolmanager = getattr(frame, "toolmanager", None)
         self.toolbar = frame.GetToolBar()
 
     def show(self):
@@ -1552,6 +1552,7 @@ def pan(self, *args):
     def configure_subplots(self, evt):
         global FigureManager  # placates pyflakes: created by @_Backend.export
         frame = wx.Frame(None, -1, "Configure subplots")
+        _set_frame_icon(frame)
 
         toolfig = Figure((6, 3))
         canvas = self.get_canvas(frame, toolfig)
@@ -1811,7 +1812,6 @@ def trigger(self, *args):
     def configure_subplots(self):
         frame = wx.Frame(None, -1, "Configure subplots")
         _set_frame_icon(frame)
-        frame.toolmanager = None
 
         toolfig = Figure((6, 3))
         canvas = self.get_canvas(frame, toolfig)
