fix meter color definitions (extra 0x in every one)

[ardour.git] / gtk2_ardour / port_matrix_column_labels.cc

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 04b57c404fc1994b8923106a851f38f2f1562f52..8e18dbea7a173032874e2aeffe6d696279609904 100644 (file)
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -18,12 +18,11 @@
 */
 
 #include <iostream>
+#include "gtkmm2ext/keyboard.h"
 #include "ardour/bundle.h"
-#include "ardour/types.h"
 #include "port_matrix_column_labels.h"
 #include "port_matrix.h"
 #include "port_matrix_body.h"
-#include "utils.h"
 
 #include "i18n.h"
 
@@ -451,7 +450,7 @@ PortMatrixColumnLabels::position_to_channel (double p, double o, boost::shared_p
 }
 
 void
-PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t, guint)
+PortMatrixColumnLabels::button_press (double x, double y, GdkEventButton* ev)
 {
        ARDOUR::BundleChannel w = position_to_channel (x, y, _matrix->visible_columns());
 
@@ -463,11 +462,13 @@ PortMatrixColumnLabels::button_press (double x, double y, int b, uint32_t t, gui
                w.channel = -1;
        }
 
-       if (b == 3) {
+       if (Gtkmm2ext::Keyboard::is_delete_event (ev) && w.channel != -1) {
+               _matrix->remove_channel (w);
+       } else if (ev->button == 3) {
                _matrix->popup_menu (
                        w,
                        ARDOUR::BundleChannel (),
-                       t
+                       ev->time
                        );
        }
 }