diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
| commit | 9f63ab9931e6478472853bdda58da47ea29ac125 (patch) | |
| tree | 7edfb1d16f580e93501c24fa9f9648fe415f3745 /gtk2_ardour/cocoacarbon.mm | |
| parent | 85ea9028b52eefb34184deb0fbd4d3c7632a2c38 (diff) | |
Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/cocoacarbon.mm')
| -rw-r--r-- | gtk2_ardour/cocoacarbon.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm index b60352eb47..6317cec6c6 100644 --- a/gtk2_ardour/cocoacarbon.mm +++ b/gtk2_ardour/cocoacarbon.mm @@ -18,6 +18,8 @@ #include <Carbon/Carbon.h> #undef check // stupid, stupid carbon +#undef YES // stupid, stupid gtkmm and/or NSObjC +#undef NO // ditto #include "ardour_ui.h" #include "actions.h" @@ -117,6 +119,6 @@ ARDOUR_UI::platform_setup () /* if invoked from the command line, make sure we're visible */ - [NSApp activateIgnoringOtherApps:YES]; + [NSApp activateIgnoringOtherApps:1]; } } |