manually apply d697a31abf2fa1b0bedcab025188f03611920fdf from master (git could not...

[ardour.git] / gtk2_ardour / editor_group_tabs.cc

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index ba94b16dd4213e08fb6c20841d3f81fefd519a91..d02181c9b6c56b8f715a87d2c9728fe783edbebe 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
 #include "editor_group_tabs.h"
 #include "editor.h"
@@ -96,7 +98,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        cairo_fill (cr);
 
        if (tab.group) {
-               pair<string, double> const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
+               pair<string, double> const f = Gtkmm2ext::fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
 
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
@@ -170,17 +172,10 @@ EditorGroupTabs::default_properties () const
        plist.add (Properties::mute, true);
        plist.add (Properties::solo, true);
        plist.add (Properties::recenable, true);
-       plist.add (Properties::edit, true);
 
        return plist;
 }
 
-string
-EditorGroupTabs::order_key () const
-{
-       return X_("editor");
-}
-
 RouteList
 EditorGroupTabs::selected_routes () const
 {
@@ -199,5 +194,5 @@ EditorGroupTabs::selected_routes () const
 void
 EditorGroupTabs::sync_order_keys ()
 {
-       _editor->_routes->sync_order_keys ("");
+       _editor->_routes->sync_order_keys_from_treeview ();
 }