diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-26 10:46:28 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:45 -0400 |
| commit | 91a95b086aa38477dc57f7ffc3466e38aa218d9f (patch) | |
| tree | f2473d37bacc2dc6ca93e099e031d812f5558c0f /gtk2_ardour/mixer_ui.h | |
| parent | 3c4503a8492d705579030a91f83a2b93f2a97b8b (diff) | |
initial sort-of-mostly-working integration of new Pane
Diffstat (limited to 'gtk2_ardour/mixer_ui.h')
| -rw-r--r-- | gtk2_ardour/mixer_ui.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index ecb7b01912..9008b66111 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -28,7 +28,6 @@ #include <gtkmm/label.h> #include <gtkmm/button.h> #include <gtkmm/frame.h> -#include <gtkmm/paned.h> #include <gtkmm/menu.h> #include <gtkmm/treeview.h> #include <gtkmm/liststore.h> @@ -42,8 +41,8 @@ #include "ardour/plugin.h" #include "ardour/plugin_manager.h" - #include "gtkmm2ext/dndtreeview.h" +#include <gtkmm2ext/pane.h> #include "gtkmm2ext/treeutils.h" #include "gtkmm2ext/tabbable.h" @@ -143,22 +142,20 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p Gtk::Frame track_display_frame; Gtk::Frame group_display_frame; Gtk::Frame favorite_plugins_frame; - Gtk::VPaned rhs_pane1; - Gtk::VPaned rhs_pane2; - Gtk::HPaned inner_pane; + Gtkmm2ext::VPane rhs_pane1; + Gtkmm2ext::VPane rhs_pane2; + Gtkmm2ext::HPane inner_pane; Gtk::HBox strip_packer; Gtk::ScrolledWindow vca_scroller; Gtk::HBox vca_packer; Gtk::EventBox vca_scroller_base; Gtk::HBox out_packer; - Gtk::HPaned list_hpane; + Gtkmm2ext::HPane list_hpane; MixerGroupTabs* _group_tabs; bool on_scroll_event (GdkEventScroll*); - void pane_allocation_handler (Gtk::Allocation&, Gtk::Paned*); - std::list<MixerStrip *> strips; void scroller_drag_data_received (const Glib::RefPtr<Gdk::DragContext>&, int, int, const Gtk::SelectionData&, guint, guint); |