Properly revert FormatSpec changes on "cancel"

[ardour.git] / gtk2_ardour / port_matrix_row_labels.h

diff --git a/gtk2_ardour/port_matrix_row_labels.h b/gtk2_ardour/port_matrix_row_labels.h
index 60a699f5f259f135c8ab23c54e532ea9d15ee5e1..59a945479a00b066e1f49611d6bcc7fa347658a5 100644 (file)
--- a/gtk2_ardour/port_matrix_row_labels.h
+++ b/gtk2_ardour/port_matrix_row_labels.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2009 Paul Davis 
+    Copyright (C) 2002-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 class PortMatrix;
 class PortMatrixBody;
 class PortMatrixNode;
+class PortMatrixColumnLabels;
 
 namespace ARDOUR {
        class Bundle;
@@ -41,22 +42,23 @@ namespace Gtk {
 class PortMatrixRowLabels : public PortMatrixLabels
 {
 public:
-       PortMatrixRowLabels (PortMatrix *, PortMatrixBody *);
+       PortMatrixRowLabels (PortMatrix *, PortMatrixBody *, PortMatrixColumnLabels&);
+
+       void button_press (double, double, GdkEventButton *);
 
-       void button_press (double, double, int, uint32_t);
-  
        double component_to_parent_x (double x) const;
        double parent_to_component_x (double x) const;
        double component_to_parent_y (double y) const;
        double parent_to_component_y (double y) const;
-       void mouseover_changed (PortMatrixNode const &);
+       void mouseover_changed (std::list<PortMatrixNode> const &);
+       void motion (double, double);
 
 private:
-       void render_channel_name (cairo_t *, Gdk::Color, double, double, ARDOUR::BundleChannel const &);
-       void render_bundle_name (cairo_t *, Gdk::Color, double, double, boost::shared_ptr<ARDOUR::Bundle>);
+       void render_channel_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, ARDOUR::BundleChannel const &);
+       void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, boost::shared_ptr<ARDOUR::Bundle>);
        double channel_x (ARDOUR::BundleChannel const &) const;
        double channel_y (ARDOUR::BundleChannel const &) const;
-       
+
        void render (cairo_t *);
        void compute_dimensions ();
        void remove_channel_proxy (boost::weak_ptr<ARDOUR::Bundle>, uint32_t);
@@ -67,7 +69,8 @@ private:
 
        double _longest_port_name;
        double _longest_bundle_name;
-       double _highest_group_name;
+
+       PortMatrixColumnLabels& _column_labels;
 };
 
 #endif