smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Paul Davis 2016-06-07 09:22:57 -04:00
parent b40fe18775
commit af9a9a9efd
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_window.h
View file

@ -37,7 +37,7 @@ namespace WM {
* method of connecting and disconnecting from a Session with * method of connecting and disconnecting from a Session with
* all other objects that have a handle on a Session. * 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: public:
ArdourWindow (std::string title); ArdourWindow (std::string title);

4
gtk2_ardour/option_editor.h
View file

@ -683,11 +683,11 @@ public:
}; };
/** The OptionEditor dialog base class */ /** The OptionEditor dialog base class */
class OptionEditor : virtual public ARDOUR::SessionHandlePtr, virtual public sigc::trackable class OptionEditor : virtual public sigc::trackable
{ {
public: public:
OptionEditor (PBD::Configuration *); OptionEditor (PBD::Configuration *);
~OptionEditor (); virtual ~OptionEditor ();
void add_option (std::string const &, OptionEditorComponent *); void add_option (std::string const &, OptionEditorComponent *);
void add_page (std::string const &, Gtk::Widget& page_widget); void add_page (std::string const &, Gtk::Widget& page_widget);

2
gtk2_ardour/rc_option_editor.h
View file

@ -34,7 +34,7 @@
*/ */
/** Editor for options which are obtained from and written back to one of the .rc files. */ /** 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: public:
RCOptionEditor (); RCOptionEditor ();