a better solution to the inheritance issue fixed in the previous commit

diff --git a/gtk2_ardour/ardour_window.h b/gtk2_ardour/ardour_window.h
index fe97855a4971e69da35f03c1a470ee184272285a..a4c5aaa0e434ffb15282589ecd6dc141522baf79 100644 (file)
--- 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 e1b05b27e385695e3ada12a99477aeb07f98e7ef..53c671287831a4288383490cf2abd5a933715644 100644 (file)
--- 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 8a445ed49f516362be8a3a859ddf0fc3d8e3f979..ebacbb707527439820fe8d9e98722d8e88b80b0a 100644 (file)
--- 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 ();