correctly package color theme files for both linux and OS X

[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 85d59d139f1050c775836b1c9402d38240b7ce07..21839df41e77914a57dafc704aef44b78977fa59 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
@@ -22,7 +22,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gdkmm/color.h>
-#include "port_matrix_component.h"
+#include "port_matrix_labels.h"
 
 class PortMatrix;
 class PortMatrixBody;
@@ -38,33 +38,36 @@ namespace Gtk {
 }
 
 /** The row labels part of the port matrix */
-class PortMatrixRowLabels : public PortMatrixComponent
+class PortMatrixRowLabels : public PortMatrixLabels
 {
 public:
        PortMatrixRowLabels (PortMatrix *, PortMatrixBody *);
 
-       void button_press (double, double, int, uint32_t);
-  
+       void button_press (double, double, GdkEventButton *);
+
        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 draw_extra (cairo_t* cr);
+       void mouseover_changed (std::list<PortMatrixNode> const &);
+       void motion (double, double);
 
 private:
+       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);
        void rename_channel_proxy (boost::weak_ptr<ARDOUR::Bundle>, uint32_t);
-       void render_port_name (cairo_t *, Gdk::Color, double, double, ARDOUR::BundleChannel const &);
-       double channel_y (ARDOUR::BundleChannel const &) const;
-       void queue_draw_for (PortMatrixNode const &);
+       void queue_draw_for (ARDOUR::BundleChannel const &);
        double port_name_x () const;
+       double bundle_name_x () const;
 
        double _longest_port_name;
        double _longest_bundle_name;
-       double _highest_group_name;
 };
 
 #endif