Make Dropdown menus at least as wide as the button

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 2e5b8b84e0bfbbb7143eaa2d7e71678e624db1fd..f7eb676d9693adeeca9c1388c6da76d51d30675f 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -26,6 +26,8 @@
 #include "ardour/playlist.h"
 #include "ardour/rc_configuration.h"
 
+#include "control_protocol/control_protocol.h"
+
 #include "audio_region_view.h"
 #include "debug.h"
 #include "gui_thread.h"
@@ -39,7 +41,7 @@
 #include "public_editor.h"
 #include "control_point.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -637,6 +639,7 @@ Selection::remove (TimeAxisView* track)
        if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) {
                track->set_selected (false);
                tracks.erase (i);
+
                if (!_no_tracks_changed) {
                        TracksChanged();
                }
@@ -951,7 +954,7 @@ Selection::selected (ArdourMarker* m)
 bool
 Selection::selected (TimeAxisView* tv)
 {
-       return tv->get_selected ();
+       return tv->selected ();
 }
 
 bool
@@ -997,7 +1000,7 @@ Selection::toggle (ControlPoint* cp)
        clear_time();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
 
-       cp->set_selected (!cp->get_selected ());
+       cp->set_selected (!cp->selected ());
        PointSelection::iterator i = find (points.begin(), points.end(), cp);
        if (i == points.end()) {
                points.push_back (cp);
@@ -1147,7 +1150,7 @@ Selection::set (ControlPoint* cp)
        clear_time ();  //enforce region/object exclusivity
        clear_tracks();  //enforce object/track exclusivity
 
-       if (cp->get_selected () && points.size () == 1) {
+       if (cp->selected () && points.size () == 1) {
                return;
        }