diff --git a/aegisub/libaegisub/Makefile b/aegisub/libaegisub/Makefile index e34bbb506fbd2ccc4f73869fb4d12729c70081ac..4c2665ae5fcfac593273f15e0553390a066584c0 100644 --- a/aegisub/libaegisub/Makefile +++ b/aegisub/libaegisub/Makefile @@ -44,7 +44,6 @@ SRC += \ ifeq (yes, $(BUILD_DARWIN)) SRC += osx/util.mm -osx/util.o: OBJCXXFLAGS += -fobjc-arc endif HEADER += \ diff --git a/aegisub/libaegisub/osx/util.mm b/aegisub/libaegisub/osx/util.mm index 41297ccbb0faca07d99fe5c1374a36f0755f6285..01164033d47df42b68362d1eff839c5c9eea53c9 100644 --- a/aegisub/libaegisub/osx/util.mm +++ b/aegisub/libaegisub/osx/util.mm @@ -84,7 +84,7 @@ std::string OSX_GetBundleAuxillaryExecutablePath(std::string const& executableNa void OSX_OpenLocation(std::string const& location) { @autoreleasepool { NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:location.c_str()]]; - LSOpenCFURLRef((__bridge CFURLRef)url, NULL); + LSOpenCFURLRef((CFURLRef)url, NULL); } } diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile index 035d3e3f47b0aea18dc5a8bb62e98e55928dc1ed..3050038c31855ba7b85f76d06f4d19b67fb0f33e 100644 --- a/aegisub/src/Makefile +++ b/aegisub/src/Makefile @@ -20,7 +20,6 @@ LDFLAGS += $(LDFLAGS_CCMALLOC) ifeq (yes, $(BUILD_DARWIN)) SRC += osx_utils.mm -osx_utils.o: OBJCXXFLAGS += -fobjc-arc endif ############### diff --git a/aegisub/src/osx_utils.mm b/aegisub/src/osx_utils.mm index 18777e068db5525c4f8116965f8751c2b2829cb2..12f0edd6bc68c991f38da8afe5c110f5956db3d4 100644 --- a/aegisub/src/osx_utils.mm +++ b/aegisub/src/osx_utils.mm @@ -23,14 +23,6 @@ #include "config.h" -// This bit of awfulness is to disable some ARC-incompatible stuff in window.h -// that we don't need -#include <wx/brush.h> -#undef wxOSX_USE_COCOA_OR_IPHONE -#define wxOSX_USE_COCOA_OR_IPHONE 0 -class WXDLLIMPEXP_FWD_CORE wxWidgetImpl; -typedef wxWidgetImpl wxOSXWidgetImpl; - #include <wx/window.h> #import <AppKit/AppKit.h> @@ -46,7 +38,7 @@ void AddFullScreenButton(wxWindow *window) { } void SetFloatOnParent(wxWindow *window) { - __unsafe_unretained NSWindow *nsWindow = [window->GetHandle() window]; + __block NSWindow *nsWindow = [window->GetHandle() window]; [nsWindow setLevel:NSFloatingWindowLevel]; if (!([nsWindow collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary))