X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.h;h=9bd39eec3e1bfbe41ed334940f342839cf6b2501;hb=50437bff22279473cd364d007d5e474af2a542bc;hp=51f744c4e550e7cbd38fadb5a70d6ca7fb1f89d0;hpb=99904735e066804358f1d0bd138a84f1e9ecda91;p=ardour.git

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 51f744c4e5..9bd39eec3e 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -25,7 +25,7 @@
 #include <gtkmm/label.h>
 #include <gdkmm/color.h>
 
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
 #include "prompter.h"
 #include "selectable.h"
 
@@ -49,19 +49,19 @@ class AxisView : public virtual Selectable
 
 	ARDOUR::Session& session() const { return _session; }
 
-	virtual string name() const = 0;
+	virtual std::string name() const = 0;
 
 	virtual bool marked_for_display() const { return _marked_for_display; }
-
 	virtual void set_marked_for_display (bool yn) {
-		if (yn != _marked_for_display) {
-			_marked_for_display = yn;
-		}
+		_marked_for_display = yn;
 	}
 	
 	sigc::signal<void> Hiding;
 	sigc::signal<void> GoingAway;
 
+	void set_old_order_key (uint32_t ok) { _old_order_key = ok; }
+	uint32_t old_order_key() const { return _old_order_key; }
+
   protected:
 
 	AxisView (ARDOUR::Session& sess);
@@ -79,12 +79,13 @@ class AxisView : public virtual Selectable
 	ARDOUR::Session& _session;
 	Gdk::Color _color;
 
-	static list<Gdk::Color> used_colors;
+	static std::list<Gdk::Color> used_colors;
 
 	Gtk::Label name_label;
 
 	bool _marked_for_display;
-	
+	uint32_t _old_order_key;
+
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */