Fix a double-free, introduced in b06713bd8e57

[ardour.git] / gtk2_ardour / vca_master_strip.h

diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 232962d2cd96fd8ab12634e9114556c1a6c2ea1e..0505788aafd6a918c5258c09dd52e99bc0fdfe28 100644 (file)
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -22,10 +22,12 @@
 #include <boost/shared_ptr.hpp>
 
 #include <gtkmm/box.h>
-#include <gtkmm/menuitem.h>
 #include <gtkmm/colorselection.h>
+#include <gtkmm/menuitem.h>
+#include <gtkmm/messagedialog.h>
+
+#include "widgets/ardour_button.h"
 
-#include "ardour_button.h"
 #include "axis_view.h"
 #include "control_slave_ui.h"
 #include "gain_meter.h"
@@ -61,22 +63,21 @@ private:
        boost::shared_ptr<ARDOUR::VCA> _vca;
        GainMeter    gain_meter;
 
-       Gtk::Frame   global_frame;
-       Gtk::VBox    global_vpacker;
-       Gtk::HBox    top_padding;
-       Gtk::HBox    bottom_padding;
-       Gtk::HBox    solo_mute_box;
-       ArdourButton width_button;
-       ArdourButton color_button;
-       ArdourButton hide_button;
-       ArdourButton number_label;
-       ArdourButton solo_button;
-       ArdourButton mute_button;
-       Gtk::Menu*   context_menu;
-       Gtk::MessageDialog* delete_dialog;
-       ArdourButton vertical_button;
-       ControlSlaveUI control_slave_ui;
-       PBD::ScopedConnectionList vca_connections;
+       Gtk::Frame                  global_frame;
+       Gtk::VBox                   global_vpacker;
+       Gtk::HBox                   bottom_padding;
+       Gtk::HBox                   solo_mute_box;
+       ArdourWidgets::ArdourButton width_button;
+       ArdourWidgets::ArdourButton color_button;
+       ArdourWidgets::ArdourButton hide_button;
+       ArdourWidgets::ArdourButton number_label;
+       ArdourWidgets::ArdourButton solo_button;
+       ArdourWidgets::ArdourButton mute_button;
+       Gtk::Menu*                  context_menu;
+       Gtk::MessageDialog*         delete_dialog;
+       ArdourWidgets::ArdourButton vertical_button;
+       ControlSlaveUI              control_slave_ui;
+       PBD::ScopedConnectionList   vca_connections;
 
        void spill ();
        void spill_change (boost::shared_ptr<ARDOUR::Stripable>);