mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Don't use ARC in the Obj-C++ code

Browse source 
It never allocated any non-autoreleased objects so ARC wasn't actually
doing anything other than breaking compilation with gcc.
This commit is contained in:
Thomas Goyne 2012-09-29 09:58:36 -07:00
parent afe0213317
commit 0a5fa6ff39
4 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/libaegisub/Makefile
View file

@ -44,7 +44,6 @@ SRC += \
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
SRC += osx/util.mm SRC += osx/util.mm
osx/util.o: OBJCXXFLAGS += -fobjc-arc
endif endif
HEADER += \ HEADER += \

2
aegisub/libaegisub/osx/util.mm
View file

@ -84,7 +84,7 @@ std::string OSX_GetBundleAuxillaryExecutablePath(std::string const& executableNa
void OSX_OpenLocation(std::string const& location) { void OSX_OpenLocation(std::string const& location) {
@autoreleasepool { @autoreleasepool {
NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:location.c_str()]]; NSURL *url = [NSURL fileURLWithPath:[NSString stringWithUTF8String:location.c_str()]];
LSOpenCFURLRef((__bridge CFURLRef)url, NULL); LSOpenCFURLRef((CFURLRef)url, NULL);
} }
} }

1
aegisub/src/Makefile
View file

@ -20,7 +20,6 @@ LDFLAGS += $(LDFLAGS_CCMALLOC)
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
SRC += osx_utils.mm SRC += osx_utils.mm
osx_utils.o: OBJCXXFLAGS += -fobjc-arc
endif endif
############### ###############

10
aegisub/src/osx_utils.mm
View file

@ -23,14 +23,6 @@
#include "config.h" #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> #include <wx/window.h>
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
@ -46,7 +38,7 @@ void AddFullScreenButton(wxWindow *window) {
} }
void SetFloatOnParent(wxWindow *window) { void SetFloatOnParent(wxWindow *window) {
__unsafe_unretained NSWindow *nsWindow = [window->GetHandle() window]; __block NSWindow *nsWindow = [window->GetHandle() window];
[nsWindow setLevel:NSFloatingWindowLevel]; [nsWindow setLevel:NSFloatingWindowLevel];
if (!([nsWindow collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary)) if (!([nsWindow collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary))