Merge pull request #15212 from anntzer/set_window_title

jklymak · web-flow · commit fef9502688d3 · 2020-12-25T13:00:17.000-08:00
Dedupe window-title setting by moving it to FigureManagerBase.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2716,6 +2716,7 @@ def __init__(self, canvas, num):
         self.canvas = canvas
         canvas.manager = self  # store a pointer to parent
         self.num = num
+        self.set_window_title(f"Figure {num:d}")
 
         self.key_press_handler_id = None
         self.button_press_handler_id = None
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -394,10 +394,9 @@ class FigureManagerTk(FigureManagerBase):
     _owns_mainloop = False
 
     def __init__(self, canvas, num, window):
-        super().__init__(canvas, num)
         self.window = window
+        super().__init__(canvas, num)
         self.window.withdraw()
-        self.set_window_title("Figure %d" % num)
         # packing toolbar first, because if space is getting low, last packed
         # widget is getting shrunk first (-> the canvas)
         self.toolbar = self._get_toolbar()
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -312,11 +312,10 @@ class FigureManagerGTK3(FigureManagerBase):
 
     """
     def __init__(self, canvas, num):
+        self.window = Gtk.Window()
         super().__init__(canvas, num)
 
-        self.window = Gtk.Window()
         self.window.set_wmclass("matplotlib", "Matplotlib")
-        self.set_window_title("Figure %d" % num)
         try:
             self.window.set_icon_from_file(window_icon)
         except Exception:
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -71,9 +71,8 @@ class FigureManagerMac(_macosx.FigureManager, FigureManagerBase):
     Wrap everything up into a window for the pylab interface
     """
     def __init__(self, canvas, num):
+        _macosx.FigureManager.__init__(self, canvas)
         FigureManagerBase.__init__(self, canvas, num)
-        title = "Figure %d" % num
-        _macosx.FigureManager.__init__(self, canvas, title)
         if mpl.rcParams['toolbar'] == 'toolbar2':
             self.toolbar = NavigationToolbar2Mac(canvas)
         else:
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -536,12 +536,11 @@ class FigureManagerQT(FigureManagerBase):
     """
 
     def __init__(self, canvas, num):
-        super().__init__(canvas, num)
         self.window = MainWindow()
+        super().__init__(canvas, num)
         self.window.closing.connect(canvas.close_event)
         self.window.closing.connect(self._widgetclosed)
 
-        self.window.setWindowTitle("Figure %d" % num)
         image = str(cbook._get_data_path('images/matplotlib.svg'))
         self.window.setWindowIcon(QtGui.QIcon(image))
 
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -446,10 +446,8 @@ class FigureManagerWebAgg(backend_bases.FigureManagerBase):
     ToolbarCls = NavigationToolbar2WebAgg
 
     def __init__(self, canvas, num):
-        super().__init__(canvas, num)
-
         self.web_sockets = set()
-
+        super().__init__(canvas, num)
         self.toolbar = self._get_toolbar(canvas)
 
     def show(self):
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -902,7 +902,7 @@ def __init__(self, num, fig):
             pos = wx.DefaultPosition
         else:
             pos = wx.Point(20, 20)
-        super().__init__(parent=None, id=-1, pos=pos, title="Figure %d" % num)
+        super().__init__(parent=None, id=-1, pos=pos)
         # Frame will be sized later by the Fit method
         _log.debug("%s - __init__()", type(self))
         self.num = num
@@ -1011,9 +1011,10 @@ class FigureManagerWx(FigureManagerBase):
 
     def __init__(self, canvas, num, frame):
         _log.debug("%s - __init__()", type(self))
+        self.frame = self.window = frame
+        self._initializing = True
         super().__init__(canvas, num)
-        self.frame = frame
-        self.window = frame
+        self._initializing = False
 
     @property
     def toolbar(self):
@@ -1023,7 +1024,7 @@ def toolbar(self):
     def toolbar(self, value):
         # Never allow this, except that base class inits this to None before
         # the frame is set up.
-        if value is not None or hasattr(self, "frame"):
+        if not self._initializing:
             raise AttributeError("can't set attribute")
 
     def show(self):
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -660,7 +660,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
     NSRect rect;
     Window* window;
     View* view;
-    const char* title;
     PyObject* size;
     int width, height;
     PyObject* obj;
@@ -672,7 +671,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
         return -1;
     }
 
-    if(!PyArg_ParseTuple(args, "Os", &obj, &title)) return -1;
+    if(!PyArg_ParseTuple(args, "O", &obj)) return -1;
 
     canvas = (FigureCanvas*)obj;
     view = canvas->view;
@@ -704,9 +703,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
                                              defer: YES
                                        withManager: (PyObject*)self];
     window = self->window;
-    [window setTitle: [NSString stringWithCString: title
-                                         encoding: NSASCIIStringEncoding]];
-
     [window setDelegate: view];
     [window makeFirstResponder: view];
     [[window contentView] addSubview: view];
