*** NEW CODING POLICY ***

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 0d09ca51aca6b795ae48048b4873af988ff75bdb..187443dab6d16ec9e6bad46afa2be7a658614e5a 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -15,16 +15,19 @@
     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__
 #define __ardour_gtk_axis_view_h__
 
 #include <list>
-#include <gtkmm.h>
-#include <pbd/xml++.h>
+
+#include <gtkmm/label.h>
+#include <gdkmm/color.h>
+
+#include "pbd/xml++.h"
 #include "prompter.h"
+#include "selectable.h"
 
 namespace ARDOUR {
        class Session;
@@ -34,7 +37,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public sigc::trackable
+class AxisView : public virtual Selectable
 {
   public:
        /**
@@ -48,24 +51,17 @@ class AxisView : public sigc::trackable
 
        virtual string name() const = 0;
 
-       virtual void set_selected (bool yn) {
-               if (yn != _selected) {
-                       _selected = yn;
-               }
-       }
-       
        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;
        }
        
-       virtual bool selected() const { return _selected; }
        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);
@@ -77,20 +73,19 @@ 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;
 
-       static list<GdkColor> used_colors;
+       static list<Gdk::Color> used_colors;
 
        Gtk::Label name_label;
 
-       bool _selected;
-
        bool _marked_for_display;
-       
+       uint32_t _old_order_key;
+
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */