added file

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index fdf4a563aceab6818c97b9aafcf6e80bb29336ee..e0ad68e5c9e183ba30a3881162bbda87fc379f9b 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -34,7 +34,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public sigc::trackable
+class AxisView : public virtual sigc::trackable
 {
   public:
        /**
@@ -42,7 +42,7 @@ class AxisView : public sigc::trackable
         *
         * @return the current Track Color
         */
-       Gdk_Color color() const { return _color; }
+       Gdk::Color color() const { return _color; }
 
        ARDOUR::Session& session() const { return _session; }
 
@@ -77,13 +77,13 @@ class AxisView : public sigc::trackable
         *
         * @return the unique random color.
         */
-       static GdkColor unique_random_color();
+       static Gdk::Color unique_random_color();
 
 
        ARDOUR::Session& _session;
-       Gdk_Color _color;
+       Gdk::Color _color;
 
-       static list<GdkColor> used_colors;
+       static list<Gdk::Color> used_colors;
 
        Gtk::Label name_label;