diff options
| -rw-r--r-- | gtk2_ardour/ardour_window.h | 2 | ||||
| -rw-r--r-- | gtk2_ardour/option_editor.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_window.h b/gtk2_ardour/ardour_window.h index fe97855a49..a4c5aaa0e4 100644 --- a/gtk2_ardour/ardour_window.h +++ b/gtk2_ardour/ardour_window.h @@ -37,7 +37,7 @@ namespace WM { * method of connecting and disconnecting from a Session with * all other objects that have a handle on a Session. */ -class ArdourWindow : public Gtk::Window, public virtual ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker +class ArdourWindow : public Gtk::Window, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker { public: ArdourWindow (std::string title); diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index e1b05b27e3..53c6712878 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -683,11 +683,11 @@ public: }; /** The OptionEditor dialog base class */ -class OptionEditor : virtual public ARDOUR::SessionHandlePtr, virtual public sigc::trackable +class OptionEditor : virtual public sigc::trackable { public: OptionEditor (PBD::Configuration *); - ~OptionEditor (); + virtual ~OptionEditor (); void add_option (std::string const &, OptionEditorComponent *); void add_page (std::string const &, Gtk::Widget& page_widget); diff --git a/gtk2_ardour/rc_option_editor.h b/gtk2_ardour/rc_option_editor.h index 8a445ed49f..ebacbb7075 100644 --- a/gtk2_ardour/rc_option_editor.h +++ b/gtk2_ardour/rc_option_editor.h @@ -34,7 +34,7 @@ */ /** Editor for options which are obtained from and written back to one of the .rc files. */ -class RCOptionEditor : public OptionEditorContainer, public Gtkmm2ext::Tabbable +class RCOptionEditor : public OptionEditorContainer, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::Tabbable { public: RCOptionEditor (); |