Various tweaks to the port matrix: open to full size; remove buttons and move their...

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 4ae8f8d46e597ce0e15818c0d615f96e06336834..9bd39eec3e1bfbe41ed334940f342839cf6b2501 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_axis_view_h__
@@ -26,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"
 
@@ -50,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);
@@ -80,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__ */