diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
| commit | bcc929a5b6760660d307c30da58efdd24c9411fb (patch) | |
| tree | 2394156d6c1a1f8f120c7d7f7cdd4bc6f98f0c7a /gtk2_ardour/time_axis_view_item.cc | |
| parent | 9c6449567d2dc6ce65b99fc1f9e94fc11cccc743 (diff) | |
waf build works on OS X ; new bindings file and processing system in place for mnemonic-us
git-svn-id: svn://localhost/ardour2/branches/3.0@5498 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view_item.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index db141a9f01..793e70c990 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -25,6 +25,13 @@ #include <gtkmm2ext/utils.h> +#include "ardour_ui.h" +/* + * ardour_ui.h was moved up in the include list + * due to a conflicting definition of 'Rect' between + * Apple's MacTypes.h file and GTK + */ + #include "public_editor.h" #include "time_axis_view_item.h" #include "time_axis_view.h" @@ -32,7 +39,6 @@ #include "utils.h" #include "canvas_impl.h" #include "rgb_macros.h" -#include "ardour_ui.h" #include "i18n.h" |