fix gtk errors caused by using non-escaped paths in a column used as a tooltip (which...

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 29f167d85e4583421c49a3633118b203066e1fa9..17f8c09a7bc18ffd00614296581b73351fc1744d 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -30,6 +30,7 @@
 
 #include "ardour/session_handle.h"
 
+#include "gui_object.h"
 #include "prompter.h"
 #include "selectable.h"
 
@@ -44,29 +45,32 @@ 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; }
 
        virtual std::string name() const = 0;
 
-       virtual bool marked_for_display() const { return _marked_for_display; }
-       virtual void set_marked_for_display (bool yn) {
-               _marked_for_display = yn;
-       }
-       
-       static PBD::Signal1<void,AxisView*> CatchDeletion;
-
        sigc::signal<void> Hiding;
-
+       
        void set_old_order_key (uint32_t ok) { _old_order_key = ok; }
        uint32_t old_order_key() const { return _old_order_key; }
 
+       virtual std::string state_id() const = 0;
+       /* for now, we always return properties in string form.
+        */
+       std::string gui_property (const std::string& property_name) const;
+       
+       template<typename T> void set_gui_property (const std::string& property_name, const T& value) {
+               gui_object_state().set_property<T> (state_id(), property_name, value);
+       }
+
+       bool marked_for_display () const;
+       virtual bool set_marked_for_display (bool);
+
+       static GUIObjectState& gui_object_state();
+       
   protected:
 
        AxisView (ARDOUR::Session* sess);
@@ -88,7 +92,6 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 
        bool _marked_for_display;
        uint32_t _old_order_key;
-
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */