MCP: various work on the button binding GUI

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index e4f419385265baf020f9209440d120452927ed6a..2c891524b8f379269419df30b3f52985235f1455 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -45,12 +45,8 @@ namespace ARDOUR {
 class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
   public:
-       /**
-        * Returns the current 'Track' Color
-        *
-        * @return the current Track Color
-        */
-       Gdk::Color color() const { return _color; }
+       /** @return the track's own color */
+       Gdk::Color color () const { return _color; }
 
        ARDOUR::Session* session() const { return _session; }
 
@@ -72,6 +68,8 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 
        bool marked_for_display () const;
        virtual bool set_marked_for_display (bool);
+
+       static GUIObjectState& gui_object_state();
        
   protected:
 
@@ -94,10 +92,6 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 
        bool _marked_for_display;
        uint32_t _old_order_key;
-
-protected:
-       static GUIObjectState& gui_object_state();
-
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */