Merge pull request #21717 from anntzer/macosxtb2

greglucas · web-flow · commit 94ac7a744913 · 2021-11-22T17:23:35.000-07:00
Simplify macosx toolbar init.
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -86,11 +86,10 @@ def close(self):
 class NavigationToolbar2Mac(_macosx.NavigationToolbar2, NavigationToolbar2):
 
     def __init__(self, canvas):
-        self.canvas = canvas  # Needed by the _macosx __init__.
         data_path = cbook._get_data_path('images')
         _, tooltips, image_names, _ = zip(*NavigationToolbar2.toolitems)
         _macosx.NavigationToolbar2.__init__(
-            self,
+            self, canvas,
             tuple(str(data_path / image_name) + ".pdf"
                   for image_name in image_names if image_name is not None),
             tuple(tooltip for tooltip in tooltips if tooltip is not None))
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1060,38 +1060,31 @@ -(void)save_figure:(id)sender
 static int
 NavigationToolbar2_init(NavigationToolbar2 *self, PyObject *args, PyObject *kwds)
 {
-    PyObject* obj;
     FigureCanvas* canvas;
-    View* view;
-
-    int i;
-    NSRect rect;
-    NSSize size;
-    NSSize scale;
+    const char* images[7];
+    const char* tooltips[7];
 
     const float gap = 2;
     const int height = 36;
     const int imagesize = 24;
 
-    self->height = height;
-
-    obj = PyObject_GetAttrString((PyObject*)self, "canvas");
-    if (!obj) {
-        PyErr_SetString(PyExc_AttributeError, "Attempt to install toolbar for NULL canvas");
-        return -1;
-    }
-    Py_DECREF(obj); /* Don't increase the reference count */
-    if (!PyObject_IsInstance(obj, (PyObject*) &FigureCanvasType)) {
-        PyErr_SetString(PyExc_TypeError, "Attempt to install toolbar for object that is not a FigureCanvas");
+    if (!PyArg_ParseTuple(args, "O!(sssssss)(sssssss)",
+                &FigureCanvasType, &canvas,
+                &images[0], &images[1], &images[2], &images[3],
+                &images[4], &images[5], &images[6],
+                &tooltips[0], &tooltips[1], &tooltips[2], &tooltips[3],
+                &tooltips[4], &tooltips[5], &tooltips[6])) {
         return -1;
     }
-    canvas = (FigureCanvas*)obj;
-    view = canvas->view;
+
+    View* view = canvas->view;
     if (!view) {
         PyErr_SetString(PyExc_RuntimeError, "NSView* is NULL");
         return -1;
     }
 
+    self->height = height;
+
     NSRect bounds = [view bounds];
     NSWindow* window = [view window];
 
@@ -1101,16 +1094,6 @@ -(void)save_figure:(id)sender
     bounds.size.height += height;
     [window setContentSize: bounds.size];
 
-    const char* images[7];
-    const char* tooltips[7];
-    if (!PyArg_ParseTuple(args, "(sssssss)(sssssss)",
-                &images[0], &images[1], &images[2], &images[3],
-                &images[4], &images[5], &images[6],
-                &tooltips[0], &tooltips[1], &tooltips[2], &tooltips[3],
-                &tooltips[4], &tooltips[5], &tooltips[6])) {
-        return -1;
-    }
-
     NSButton* buttons[7];
     SEL actions[7] = {@selector(home:),
                       @selector(back:),
@@ -1127,23 +1110,23 @@ -(void)save_figure:(id)sender
                                    NSButtonTypeMomentaryLight,
                                    NSButtonTypeMomentaryLight};
 
-    rect.origin.x = 0;
-    rect.origin.y = 0;
-    rect.size.width = imagesize;
-    rect.size.height = imagesize;
+    NSRect rect;
+    NSSize size;
+    NSSize scale;
+
+    rect = NSMakeRect(0, 0, imagesize, imagesize);
 #ifdef COMPILING_FOR_10_7
     rect = [window convertRectToBacking: rect];
 #endif
     size = rect.size;
-    scale.width = imagesize / size.width;
-    scale.height = imagesize / size.height;
+    scale = NSMakeSize(imagesize / size.width, imagesize / size.height);
 
     rect.size.width = 32;
     rect.size.height = 32;
     rect.origin.x = gap;
     rect.origin.y = 0.5*(height - rect.size.height);
 
-    for (i = 0; i < 7; i++) {
+    for (int i = 0; i < 7; i++) {
         NSString* filename = [NSString stringWithCString: images[i]
                                                 encoding: NSUTF8StringEncoding];
         NSString* tooltip = [NSString stringWithCString: tooltips[i]
