summaryrefslogtreecommitdiff
path: root/gtk2_ardour/option_editor.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-06-07 09:05:50 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-06-07 09:05:50 -0400
commitb40fe187758b6890579311a3250129288730a328 (patch)
treec6e878a895a589d44a2eb07f1f471fb1141b61b6 /gtk2_ardour/option_editor.h
parenta88fa99049c3d4c5609f6cbcf4710ad56d77e964 (diff)
fix up inheritance heirarchy and constructors so that the Session Properties dialog IS-A ArdourWindow
... and is thus subject to Ctrl-w to close it
Diffstat (limited to 'gtk2_ardour/option_editor.h')
-rw-r--r--gtk2_ardour/option_editor.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index f29fe1ed47..e1b05b27e3 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -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 &);