Merge branch 'selection_fixes' of https://github.com/nmains/ardour into cairocanvas
authorRobin Gareus <robin@gareus.org>
Thu, 14 Aug 2014 15:48:11 +0000 (17:48 +0200)
committerRobin Gareus <robin@gareus.org>
Thu, 14 Aug 2014 15:48:11 +0000 (17:48 +0200)
1  2 
gtk2_ardour/route_ui.cc

diff --combined gtk2_ardour/route_ui.cc
index 86f8697647b038db6957407fca7a2d65e536efd9,ef1f2e716cf8148d41e85a5ae0624a934d46b652..a9d63a53b5b90626ad85f53ba513b5f1551ff7d8
@@@ -77,6 -77,8 +77,8 @@@ RouteUI::RouteUI (ARDOUR::Session* sess
        , sends_menu(0)
        , record_menu(0)
        , comment_window(0)
+       , input_selector (0)
+       , output_selector (0)
        , _invert_menu(0)
  {
        if (sess) init ();
@@@ -91,10 -93,10 +93,10 @@@ RouteUI::~RouteUI(
        delete mute_menu;
        delete sends_menu;
          delete record_menu;
-       delete _invert_menu;
        delete comment_window;
        delete input_selector;
        delete output_selector;
+       delete _invert_menu;
  }
  
  void
@@@ -1996,6 -1998,8 +1998,6 @@@ RouteUI::setup_invert_buttons (
  
        for (uint32_t i = 0; i < to_add; ++i) {
                ArdourButton* b = manage (new ArdourButton);
 -              b->set_size_request(20,20);
 -              Gtkmm2ext::set_height_request_to_display_any_text (*b, _button_vpad);
                b->signal_button_press_event().connect (sigc::mem_fun (*this, &RouteUI::invert_press));
                b->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_release), i));