smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

fix up inheritance heirarchy and constructors so that the Session Properties dialog IS-A ArdourWindow

Browse source 
... and is thus subject to Ctrl-w to close it
This commit is contained in:
Paul Davis 2016-06-07 09:05:50 -04:00
parent a88fa99049
commit b40fe18775
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/option_editor.h
View file

@ -683,10 +683,10 @@ public:
};
/** The OptionEditor dialog base class */
class OptionEditor : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
class OptionEditor : virtual public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
{
public:
OptionEditor (PBD::Configuration *, std::string const &);
OptionEditor (PBD::Configuration *);
~OptionEditor ();
void add_option (std::string const &, OptionEditorComponent *);
@ -737,7 +737,7 @@ private:
};
/** The OptionEditor dialog-as-container base class */
class OptionEditorWindow : public OptionEditor, public Gtk::Window
class OptionEditorWindow : public OptionEditor, public ArdourWindow
{
public:
OptionEditorWindow (PBD::Configuration *, std::string const &);