X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_ui.h;h=916ef5aa21bea6255d05eaf4992686f0be8b0538;hb=8d81f121e5b68030eea5444c3ebad14d6a0bfa82;hp=4721bf106f81c75fd301b3ebffc384391452d20b;hpb=9010262bed21611f2db652d16f63e4af4380259d;p=ardour.git

diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 4721bf106f..916ef5aa21 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -43,7 +43,6 @@
 #include "ardour/plugin_manager.h"
 
 
-#include "gtkmm2ext/visibility_tracker.h"
 #include "gtkmm2ext/dndtreeview.h"
 #include "gtkmm2ext/treeutils.h"
 
@@ -75,13 +74,13 @@ protected:
 	virtual bool row_drop_possible_vfunc (const Gtk::TreeModel::Path&, const Gtk::SelectionData&) const;
 };
 
-class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor, public Gtkmm2ext::VisibilityTracker
+class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public MixerActor
 {
   public:
 	static Mixer_UI* instance();
 	~Mixer_UI();
 
-	Gtk::Window* use_own_window ();
+	Gtk::Window* use_own_window (bool and_fill_it);
 	void show_window ();
 
 	void set_session (ARDOUR::Session *);
@@ -153,8 +152,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 	void set_window_pos_and_size ();
 	void get_window_pos_and_size ();
 
-	bool on_key_press_event (GdkEventKey*);
-	bool on_key_release_event (GdkEventKey*);
 	bool on_scroll_event (GdkEventScroll*);
 
 	void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*);
@@ -349,7 +346,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 
 	void monitor_section_going_away ();
 
-<<<<<<< HEAD
 	void monitor_section_attached ();
 	void monitor_section_detached ();
 
@@ -360,10 +356,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 	void sync_treeview_favorite_ui_state (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator&);
 	void save_favorite_ui_state (const Gtk::TreeModel::iterator& iter, const Gtk::TreeModel::Path& path);
 
-=======
-	void create_own_window ();
-
->>>>>>> the basics of tabbed
 	/// true if we are in fullscreen mode
 	bool _maximised;