add left/right side trim cursors and use them for region trimming, as appropriate

[ardour.git] / gtk2_ardour / cocoacarbon.mm

diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm
index e4f833dd26e98131d544f677ff33d9213dd9aae7..84e34bd74d82c1b830c185c42cd0e253fe5c7128 100644 (file)
--- a/gtk2_ardour/cocoacarbon.mm
+++ b/gtk2_ardour/cocoacarbon.mm
@@ -21,6 +21,14 @@
 #undef YES   // stupid, stupid gtkmm and/or NSObjC
 #undef NO    // ditto
 
+#ifdef GTKOSX
+#include <objc/objc.h>
+#ifdef nil
+       /*Stupid OS X defining nil*/
+#undef nil
+#endif
+#endif
+
 #include "ardour_ui.h"
 #include "actions.h"
 #include "opts.h"