diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/editor_component.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/interactive-item.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index eef401562a..c21393247c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -28,6 +28,13 @@ #include <algorithm> #include <map> +#include "ardour_ui.h" +/* + * ardour_ui.h include was moved to the top of the list + * due to a conflicting definition of 'Style' between + * Apple's MacTypes.h and BarController. + */ + #include <boost/none.hpp> #include <sigc++/bind.h> @@ -69,7 +76,6 @@ #include "control_protocol/control_protocol.h" -#include "ardour_ui.h" #include "editor.h" #include "keyboard.h" #include "marker.h" diff --git a/gtk2_ardour/editor_component.h b/gtk2_ardour/editor_component.h index e5ec1259dc..5c1ae8be2a 100644 --- a/gtk2_ardour/editor_component.h +++ b/gtk2_ardour/editor_component.h @@ -33,6 +33,7 @@ class EditorComponent { public: EditorComponent (Editor *); + virtual ~EditorComponent() {} virtual void connect_to_session (ARDOUR::Session *); diff --git a/gtk2_ardour/interactive-item.h b/gtk2_ardour/interactive-item.h index a37b3be3dc..0efe2fea69 100644 --- a/gtk2_ardour/interactive-item.h +++ b/gtk2_ardour/interactive-item.h @@ -34,6 +34,8 @@ namespace Canvas { */ class InteractiveItem { public: + virtual ~InteractiveItem() {} + virtual bool on_event(GdkEvent* ev) = 0; }; diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index b584338471..ec68a5d8d9 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -53,6 +53,8 @@ class OptionEditorPage; class OptionEditorComponent { public: + virtual ~OptionEditorComponent() {} + /** Called when a configuration parameter's value has changed. * @param p parameter name */ diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 9c1b8ae3bf..2807511937 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -371,7 +371,7 @@ def build(bld): # Menus menus_argv = [] if bld.env['GTKOSX']: - menus_argv = [ '-E', '-P', '-DGTKOSX', '-DTOP_MENUBAR' ] + menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ] obj = bld.new_task_gen('command-output') |