Change to static method for setting icon

joelfrederico · joelfrederico · commit 417aea6d204b · 2021-12-03T00:13:47.000-08:00
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -66,8 +66,9 @@ 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)
         icon_path = str(cbook._get_data_path('images/matplotlib.pdf'))
-        _macosx.FigureManager.__init__(self, canvas, icon_path)
+        _macosx.FigureManager.set_icon(icon_path)
         FigureManagerBase.__init__(self, canvas, num)
         if mpl.rcParams['toolbar'] == 'toolbar2':
             self.toolbar = NavigationToolbar2Mac(canvas)
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -629,37 +629,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
     return (PyObject*)self;
 }
 
-int set_icon(PyObject* icon_path) {
-    if (!icon_path) {
-        return 0;
-    }
-    const char* icon_path_ptr = PyUnicode_AsUTF8(icon_path);
-    if (!icon_path_ptr) {
-        Py_DECREF(icon_path);
-        return -1;
-    }
-    @autoreleasepool {
-        NSString* ns_icon_path = [NSString stringWithUTF8String: icon_path_ptr];
-        if (!ns_icon_path) {
-            Py_DECREF(icon_path);
-            PyErr_SetString(PyExc_RuntimeError, "Could not convert to NSString*");
-            return -1;
-        }
-        NSImage* image = [[[NSImage alloc] initByReferencingFile: ns_icon_path] autorelease];
-        if (!image) {
-            PyErr_SetString(PyExc_RuntimeError, "Could not create NSImage*");
-            return -1;
-        }
-        if (!image.valid) {
-            PyErr_SetString(PyExc_RuntimeError, "Image is not valid");
-            return -1;
-        }
-        NSApplication* app = [NSApplication sharedApplication];
-        app.applicationIconImage = image;
-    }
-    return 0;
-}
-
 static int
 FigureManager_init(FigureManager *self, PyObject *args, PyObject *kwds)
 {
@@ -669,21 +638,14 @@ int set_icon(PyObject* icon_path) {
     PyObject* size;
     int width, height;
     FigureCanvas* canvas;
-    PyObject* icon_path;
 
     if (!self->window) {
         PyErr_SetString(PyExc_RuntimeError, "NSWindow* is NULL");
         return -1;
     }
-    static char* kwlist[3] = { "canvas", "icon_path", NULL };
-    icon_path = NULL;
-    if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                "O!|O&", kwlist,
-                &FigureCanvasType, &canvas,
-                &PyUnicode_FSDecoder, &icon_path)) {
-        return -1;
-    }
-    if (set_icon(icon_path)) {
+    static char* kwlist[3] = { "canvas", NULL };
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", kwlist,
+	  &FigureCanvasType, &canvas)) {
         return -1;
     }
 
@@ -762,6 +724,41 @@ int set_icon(PyObject* icon_path) {
     Py_RETURN_NONE;
 }
 
+static PyObject*
+FigureManager_set_icon(PyObject* null, PyObject* args, PyObject* kwds) {
+    PyObject* icon_path;
+    static char* kwlist[3] = { "icon_path", NULL };
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kwlist,
+	  &PyUnicode_FSDecoder, &icon_path)) {
+	return NULL;
+    }
+    const char* icon_path_ptr = PyUnicode_AsUTF8(icon_path);
+    if (!icon_path_ptr) {
+        Py_DECREF(icon_path);
+        return NULL;
+    }
+    @autoreleasepool {
+        NSString* ns_icon_path = [NSString stringWithUTF8String: icon_path_ptr];
+	Py_DECREF(icon_path);
+        if (!ns_icon_path) {
+            PyErr_SetString(PyExc_RuntimeError, "Could not convert to NSString*");
+            return NULL;
+        }
+        NSImage* image = [[[NSImage alloc] initByReferencingFile: ns_icon_path] autorelease];
+        if (!image) {
+            PyErr_SetString(PyExc_RuntimeError, "Could not create NSImage*");
+            return NULL;
+        }
+        if (!image.valid) {
+            PyErr_SetString(PyExc_RuntimeError, "Image is not valid");
+            return NULL;
+        }
+        NSApplication* app = [NSApplication sharedApplication];
+        app.applicationIconImage = image;
+    }
+    Py_RETURN_NONE;
+}
+
 static PyObject*
 FigureManager_set_window_title(FigureManager* self,
                                PyObject *args, PyObject *kwds)
@@ -828,6 +825,11 @@ int set_icon(PyObject* icon_path) {
      METH_NOARGS,
      NULL,  // docstring inherited.
     },
+    {"set_icon",
+     (PyCFunction)FigureManager_set_icon,
+     METH_STATIC | METH_VARARGS | METH_KEYWORDS,
+     NULL,  // Set application icon
+    },
     {"set_window_title",
      (PyCFunction)FigureManager_set_window_title,
      METH_VARARGS,
