Removing use of -retain (incompatible with ARC). (#243)

wjakob · Aug 10, 2017 · f9c3951 · f9c3951
1 parent 275aa69
commit f9c3951
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -289,6 +289,11 @@ if (APPLE OR CMAKE_SYSTEM MATCHES "Linux")
   list(APPEND LIBNANOGUI_PYTHON_EXTRA_SOURCE ext/coro/coro.c)
 endif()
 
+if (APPLE)
+  # Use automatic reference counting for Objective-C portions
+  add_compile_options(-fobjc-arc)
+endif()
+
 add_definitions(${NANOGUI_EXTRA_DEFS})
 
 # Compile main NanoGUI library

diff --git a/src/darwin.mm b/src/darwin.mm
@@ -6,7 +6,7 @@
 std::string file_dialog(const std::vector<std::pair<std::string, std::string>> &filetypes, bool save) {
     std::string path = "";
     if (save) {
-        NSSavePanel *saveDlg = [[NSSavePanel savePanel] retain];
+        NSSavePanel *saveDlg = [NSSavePanel savePanel];
 
         NSMutableArray *types = [NSMutableArray new];
         for (size_t idx = 0; idx < filetypes.size(); ++idx)
@@ -17,7 +17,7 @@
         if ([saveDlg runModal] == NSModalResponseOK)
             path = [[[saveDlg URL] path] UTF8String];
     } else {
-        NSOpenPanel *openDlg = [[NSOpenPanel openPanel] retain];
+        NSOpenPanel *openDlg = [NSOpenPanel openPanel];
 
         [openDlg setCanChooseFiles:YES];
         [openDlg setCanChooseDirectories:NO];