make inclusion/exclusion of hidden children optional in Item::add_child_bounding_boxes

[ardour.git] / gtk2_ardour / option_editor.h

diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index f29fe1ed479763e0da2a730e4bce9e9ba9dce37a..b5d44d577ca048d3b94fb44cc8ddda13bb0c1fdd 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 : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
+class OptionEditor : virtual public sigc::trackable
 {
 public:
-       OptionEditor (PBD::Configuration *, std::string const &);
-       ~OptionEditor ();
+       OptionEditor (PBD::Configuration *);
+       virtual ~OptionEditor ();
 
        void add_option (std::string const &, OptionEditorComponent *);
        void add_page (std::string const &, Gtk::Widget& page_widget);
@@ -723,6 +723,8 @@ private:
        std::map<std::string, OptionEditorPage*> _pages;
 
        void add_path_to_treeview (std::string const &, Gtk::Widget&);
+       Gtk::TreeModel::iterator find_path_in_treemodel (std::string const & pn,
+                                                        bool create_missing = false);
        void treeview_row_selected ();
 };
 
@@ -737,7 +739,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 &);