Revert "MNT: Change objective C code to Automatic Reference Counting (ARC)"

greglucas · greglucas · commit 5dc115bb6e69 · 2022-08-17T16:21:46.000-06:00
This reverts commit b46ab89. Revert "FIX: remove one more autorelease" This reverts commit ec0a325.
diff --git a/setupext.py b/setupext.py
@@ -783,7 +783,7 @@ def get_extensions(self):
             'matplotlib.backends._macosx', [
                 'src/_macosx.m'
             ])
-        ext.extra_compile_args.extend(['-Werror', '-fobjc-arc'])
+        ext.extra_compile_args.extend(['-Werror'])
         ext.extra_link_args.extend(['-framework', 'Cocoa'])
         if platform.python_implementation().lower() == 'pypy':
             ext.extra_compile_args.append('-DPYPY=1')
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1,7 +1,3 @@
-#if  ! __has_feature(objc_arc)
-#error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
-#endif
-
 #define PY_SSIZE_T_CLEAN
 #include <Cocoa/Cocoa.h>
 #include <ApplicationServices/ApplicationServices.h>
@@ -374,14 +370,15 @@ static CGFloat _get_device_scale(CGContextRef cr)
 FigureCanvas_dealloc(FigureCanvas* self)
 {
     [self->view setCanvas: NULL];
+    [self->view release];
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 static PyObject*
 FigureCanvas_repr(FigureCanvas* self)
 {
     return PyUnicode_FromFormat("FigureCanvas object %p wrapping NSView %p",
-                               (void*)self, (__bridge void*)(self->view));
+                               (void*)self, (void*)(self->view));
 }
 
 static PyObject*
@@ -585,6 +582,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
     if (!window) { return NULL; }
     FigureManager *self = (FigureManager*)type->tp_alloc(type, 0);
     if (!self) {
+        [window release];
         return NULL;
     }
     self->window = window;
@@ -637,7 +635,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
 FigureManager_repr(FigureManager* self)
 {
     return PyUnicode_FromFormat("FigureManager object %p wrapping NSWindow %p",
-                               (void*) self, (__bridge void*)(self->window));
+                               (void*) self, (void*)(self->window));
 }
 
 static void
@@ -687,7 +685,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
             PyErr_SetString(PyExc_RuntimeError, "Could not convert to NSString*");
             return NULL;
         }
-        NSImage* image = [[NSImage alloc] initByReferencingFile: ns_icon_path];
+        NSImage* image = [[[NSImage alloc] initByReferencingFile: ns_icon_path] autorelease];
         if (!image) {
             PyErr_SetString(PyExc_RuntimeError, "Could not create NSImage*");
             return NULL;
@@ -802,7 +800,7 @@ @interface NavigationToolbar2Handler : NSObject
     NSButton* zoombutton;
 }
 - (NavigationToolbar2Handler*)initWithToolbar:(PyObject*)toolbar;
-- (void)installCallbacks:(SEL[7])actions forButtons:(NSButton*__strong [7])buttons;
+- (void)installCallbacks:(SEL[7])actions forButtons:(NSButton*[7])buttons;
 - (void)home:(id)sender;
 - (void)back:(id)sender;
 - (void)forward:(id)sender;
@@ -823,12 +821,12 @@ - (void)save_figure:(id)sender;
 @implementation NavigationToolbar2Handler
 - (NavigationToolbar2Handler*)initWithToolbar:(PyObject*)theToolbar
 {
-    self = [self init];
+    [self init];
     toolbar = theToolbar;
     return self;
 }
 
-- (void)installCallbacks:(SEL[7])actions forButtons:(NSButton*__strong [7])buttons
+- (void)installCallbacks:(SEL[7])actions forButtons:(NSButton*[7])buttons
 {
     int i;
     for (i = 0; i < 7; i++) {
@@ -869,6 +867,7 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
     if (!handler) { return NULL; }
     NavigationToolbar2 *self = (NavigationToolbar2*)type->tp_alloc(type, 0);
     if (!self) {
+        [handler release];
         return NULL;
     }
     self->handler = handler;
@@ -958,6 +957,8 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
         [buttons[i] setImagePosition: NSImageOnly];
         [buttons[i] setToolTip: tooltip];
         [[window contentView] addSubview: buttons[i]];
+        [buttons[i] release];
+        [image release];
         rect.origin.x += rect.size.width + gap;
     }
 
@@ -970,7 +971,7 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
     // Make it a zero-width box if we don't have enough room
     rect.size.width = fmax(bounds.size.width - rect.origin.x, 0);
     rect.origin.x = bounds.size.width - rect.size.width;
-    NSTextView* messagebox = [[NSTextView alloc] initWithFrame: rect];
+    NSTextView* messagebox = [[[NSTextView alloc] initWithFrame: rect] autorelease];
     messagebox.textContainer.maximumNumberOfLines = 2;
     messagebox.textContainer.lineBreakMode = NSLineBreakByTruncatingTail;
     messagebox.alignment = NSTextAlignmentRight;
@@ -980,6 +981,7 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
     /* if selectable, the messagebox can become first responder,
      * which is not supposed to happen */
     [[window contentView] addSubview: messagebox];
+    [messagebox release];
     [[window contentView] display];
 
     self->messagebox = messagebox;
@@ -989,6 +991,7 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }
 static void
 NavigationToolbar2_dealloc(NavigationToolbar2 *self)
 {
+    [self->handler release];
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -1089,6 +1092,36 @@ + (WindowServerConnectionManager *)sharedManager
     return sharedWindowServerConnectionManager;
 }
 
++ (id)allocWithZone:(NSZone *)zone
+{
+    return [[self sharedManager] retain];
+}
+
++ (id)copyWithZone:(NSZone *)zone
+{
+    return self;
+}
+
++ (id)retain
+{
+    return self;
+}
+
+- (NSUInteger)retainCount
+{
+    return NSUIntegerMax;  //denotes an object that cannot be released
+}
+
+- (oneway void)release
+{
+    // Don't release a singleton object
+}
+
+- (id)autorelease
+{
+    return self;
+}
+
 - (void)launch:(NSNotification*)notification
 {
     CFRunLoopRef runloop;
@@ -1166,6 +1199,7 @@ - (void)dealloc
      * content view of this window was increased during the call to addSubview,
      * and is decreased during the call to [super dealloc].
      */
+    [super dealloc];
 }
 @end
 
@@ -1187,6 +1221,7 @@ - (void)dealloc
 {
     FigureCanvas* fc = (FigureCanvas*)canvas;
     if (fc) { fc->view = NULL; }
+    [super dealloc];
 }
 
 - (void)setCanvas: (PyObject*)newCanvas
