X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_component.h;h=0b472e157ddc48fb57efa111de14260455aa34da;hb=9971e718fed4a1126d97bad69f2608638d5a5464;hp=86cd0565ae48cffa1309754f8df6470bd4ea672b;hpb=b7cfd2849ebb0d949af3ee39f70cbf1856fbfe0f;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h
index 86cd0565ae..0b472e157d 100644
--- a/gtk2_ardour/port_matrix_component.h
+++ b/gtk2_ardour/port_matrix_component.h
@@ -31,6 +31,7 @@ class PortGroup;
 class PortGroupList;
 
 namespace ARDOUR {
+	class Bundle;
 	class BundleChannel;
 }
 
@@ -49,8 +50,8 @@ public:
 	virtual double parent_to_component_y (double y) const = 0;
 	virtual void mouseover_changed (std::list<PortMatrixNode> const &) = 0;
 	virtual void draw_extra (cairo_t *) = 0;
-	virtual void button_press (double, double, int, uint32_t) {}
-	virtual void button_release (double, double, int, uint32_t) {}
+	virtual void button_press (double, double, GdkEventButton *) {}
+	virtual void button_release (double, double, GdkEventButton *) {}
 	virtual void motion (double, double) {}
 
 	void set_show_ports (bool);
@@ -137,7 +138,7 @@ protected:
 	}
 
 	/** @return colour to paint grid squares when they can't be associated */
-	static Gdk::Color unknown_colour () {
+	static Gdk::Color non_connectable_colour () {
 		return Gdk::Color ("#cccccc");
 	}
 
@@ -154,9 +155,9 @@ protected:
 	/* XXX */
 	static Gdk::Color get_a_bundle_colour (int x) {
 		if ((x % 2) == 0) {
-			return Gdk::Color ("#547027");
+			return Gdk::Color ("#555555");
 		} else {
-			return Gdk::Color ("#3552a6");
+			return Gdk::Color ("#666666");
 		}
 	}