Make Dropdown menus at least as wide as the button

[ardour.git] / gtk2_ardour / vca_time_axis.cc

diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc
index 0c77fd66f844fbdd103a980fb1d8930a61a8a750..f98cda008c7920f923c21c83b3dc7ce855a45805 100644 (file)
--- a/gtk2_ardour/vca_time_axis.cc
+++ b/gtk2_ardour/vca_time_axis.cc
@@ -33,7 +33,7 @@
 #include "ui_config.h"
 #include "vca_time_axis.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -83,6 +83,9 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca
        spill_button.show ();
        gain_meter.get_gain_slider().show ();
 
+       controls_ebox.set_name ("ControlMasterBaseUnselected");
+       time_axis_frame.set_name ("ControlMasterBaseUnselected");
+
        s->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
        Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
        UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &VCATimeAxisView::parameter_changed));
@@ -308,13 +311,13 @@ VCATimeAxisView::set_height (uint32_t h, TrackHeightMode m)
 bool
 VCATimeAxisView::marked_for_display () const
 {
-       return !_vca->presentation_info().hidden();
+       return _vca && !_vca->presentation_info().hidden();
 }
 
 bool
 VCATimeAxisView::set_marked_for_display (bool yn)
 {
-       if (yn == _vca->presentation_info().hidden()) {
+       if (_vca && (yn == _vca->presentation_info().hidden())) {
                _vca->presentation_info().set_hidden (!yn);
                return true; // things changed
        }