ardour/livetrax
13
0
Fork 0
Code

OSX 10.9.5 clang++ loves nil more than ever

Browse Source 
#undef nil // for sigc++ compat does no longer work as expected.
This commit is contained in:
Robin Gareus 2014-10-07 14:48:08 +02:00
parent 7bfa25777b
commit aab64ecd5c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/au_pluginui.mm
View File

@ -1,6 +1,9 @@
#undef Marker #undef Marker
#define Marker FuckYouAppleAndYourLackOfNameSpaces #define Marker FuckYouAppleAndYourLackOfNameSpaces
#include <gtkmm/button.h>
#include <gdk/gdkquartz.h>
#include "pbd/convert.h" #include "pbd/convert.h"
#include "pbd/error.h" #include "pbd/error.h"
@ -10,9 +13,6 @@
#undef check // stupid gtk, stupid apple #undef check // stupid gtk, stupid apple
#include <gtkmm/button.h>
#include <gdk/gdkquartz.h>
#include <gtkmm2ext/utils.h> #include <gtkmm2ext/utils.h>
#include "au_pluginui.h" #include "au_pluginui.h"
@ -34,7 +34,6 @@
using namespace ARDOUR; using namespace ARDOUR;
using namespace Gtk; using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace sigc;
using namespace std; using namespace std;
using namespace PBD; using namespace PBD;
@ -84,12 +83,12 @@ dump_view_tree (NSView* view, int depth)
[[NSNotificationCenter defaultCenter] addObserver:self [[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(cocoaParentActivationHandler:) selector:@selector(cocoaParentActivationHandler:)
name:NSWindowDidBecomeMainNotification name:NSWindowDidBecomeMainNotification
object:nil]; object:NULL];
[[NSNotificationCenter defaultCenter] addObserver:self [[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(cocoaParentBecameKeyHandler:) selector:@selector(cocoaParentBecameKeyHandler:)
name:NSWindowDidBecomeKeyNotification name:NSWindowDidBecomeKeyNotification
object:nil]; object:NULL];
} }
} }
@ -366,7 +365,7 @@ AUPluginUI::create_cocoa_view ()
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create bundle, result = %1\n", viewBundle)); DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create bundle, result = %1\n", viewBundle));
if (viewBundle == nil) { if (viewBundle == NULL) {
error << _("AUPluginUI: error loading AU view's bundle") << endmsg; error << _("AUPluginUI: error loading AU view's bundle") << endmsg;
return -1; return -1;
} else { } else {
@ -384,7 +383,7 @@ AUPluginUI::create_cocoa_view ()
} }
// make a factory // make a factory
id factory = [[[factoryClass alloc] init] autorelease]; id factory = [[[factoryClass alloc] init] autorelease];
if (factory == nil) { if (factory == NULL) {
error << _("AUPluginUI: Could not create an instance of the AU view factory") << endmsg; error << _("AUPluginUI: Could not create an instance of the AU view factory") << endmsg;
return -1; return -1;
} }
@ -661,13 +660,13 @@ AUPluginUI::parent_cocoa_window ()
NSPoint origin = { 0, static_cast<CGFloat> (a.height) }; NSPoint origin = { 0, static_cast<CGFloat> (a.height) };
[au_view setFrameOrigin:origin]; [au_view setFrameOrigin:origin];
[view addSubview:au_view positioned:NSWindowBelow relativeTo:nil]; [view addSubview:au_view positioned:NSWindowBelow relativeTo:NULL];
last_au_frame = [au_view frame]; last_au_frame = [au_view frame];
// watch for size changes of the view // watch for size changes of the view
_notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:nil andTopLevelParent:win ]; _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:NULL andTopLevelParent:win ];
[[NSNotificationCenter defaultCenter] addObserver:_notify [[NSNotificationCenter defaultCenter] addObserver:_notify
selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification