diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-29 16:44:49 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-29 16:44:49 +0000 |
| commit | c19121459bb13cdd457d9c7d00aac7ce099ce79e (patch) | |
| tree | d29f05dda4a68fbac1215ae0490396d3dedd1d04 /gtk2_ardour | |
| parent | 8bad14ff6543975855366b98b6b9fed92ccc4885 (diff) | |
stupid hack to fix issues with OS X Carbon headers
git-svn-id: svn://localhost/ardour2/branches/3.0@11107 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_route_groups.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/fix_carbon.h | 36 | ||||
| -rw-r--r-- | gtk2_ardour/theme_manager.cc | 2 |
3 files changed, 40 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index cdc2d2c5aa..b55ae1f276 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -24,6 +24,8 @@ #include <cstdlib> #include <cmath> +#include "fix_carbon.h" + #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/cell_renderer_color_selector.h" diff --git a/gtk2_ardour/fix_carbon.h b/gtk2_ardour/fix_carbon.h new file mode 100644 index 0000000000..62ff0f3e4e --- /dev/null +++ b/gtk2_ardour/fix_carbon.h @@ -0,0 +1,36 @@ +/* + Copyright (C) 2011 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __gtk2_ardour_fix_carbon_h__ +#define __gtk2_ardour_fix_carbon_h__ + +#ifdef __APPLE__ + +/* an awful hack to stop Carbon #defines from messing with other code + */ + +#include "/System/Library/Frameworks/CoreServices.framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h" +#undef Style +#undef Fixed +#undef Yes +#undef No +#undef nil +#endif + +#endif diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index e42ec384c7..47ae4b7390 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -22,6 +22,8 @@ #include <fstream> #include <errno.h> +#include "fix_carbon.h" + #include <gtkmm/stock.h> #include <gtkmm/settings.h> |