include ArdourIcon in declared enums

[ardour.git] / gtk2_ardour / time_axis_view_item.h

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 576e2ae76a9a8f35bc9ebfc60fa6f8e04bea7182..19bf84b1bc516eab10fd2e4d48ed91c49e6c47c8 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -33,7 +33,7 @@ namespace ArdourCanvas {
        class Pixbuf;
        class Rectangle;
        class Item;
-        class Container;
+       class Container;
        class Text;
 }
 
@@ -76,7 +76,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        void set_color (uint32_t);
        void set_name_text_color ();
 
-       uint32_t get_fill_color () const;
+       virtual uint32_t get_fill_color () const;
 
        ArdourCanvas::Item* get_canvas_frame();
        ArdourCanvas::Item* get_canvas_group();
@@ -158,9 +158,9 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 
        TimeAxisViewItem (const TimeAxisViewItem&);
 
-        void init (ArdourCanvas::Item*, double, uint32_t, framepos_t, framepos_t, Visibility, bool, bool);
+       void init (ArdourCanvas::Item*, double, uint32_t, framepos_t, framepos_t, Visibility, bool, bool);
 
-        virtual bool canvas_group_event (GdkEvent*);
+       virtual bool canvas_group_event (GdkEvent*);
 
        virtual void set_colors();
        virtual void set_frame_color();
@@ -210,20 +210,14 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        /** true if the name should respond to events */
        bool name_connected;
 
-       /** true if a small vestigial rect should be shown when the item gets very narrow */
-       bool show_vestigial;
-
        uint32_t fill_color;
 
-       virtual uint32_t fill_opacity() const;
-
        uint32_t last_item_width;
        int name_text_width;
        bool wide_enough_for_name;
        bool high_enough_for_name;
 
        ArdourCanvas::Container*      group;
-       ArdourCanvas::Rectangle* vestigial_frame;
        ArdourCanvas::Rectangle* frame;
        ArdourCanvas::Rectangle* selection_frame;
        ArdourCanvas::Text*      name_text;
@@ -233,21 +227,20 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        ArdourCanvas::Rectangle* frame_handle_start; ///< `frame' (fade) handle for the start of the item, or 0
        ArdourCanvas::Rectangle* frame_handle_end; ///< `frame' (fade) handle for the end of the item, or 0
 
-        bool frame_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*);
+       bool frame_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*);
 
        double _height;
        Visibility visibility;
-       std::string _fill_color_name;
+       std::string fill_color_name;
        bool _recregion;
        bool _automation; ///< true if this is an automation region view
        bool _dragging;
-
-private:
         double _width;
 
+private:
        void parameter_changed (std::string);
-        void manage_name_highlight ();
-        void manage_name_text ();
+       void manage_name_highlight ();
+       void manage_name_text ();
 
 }; /* class TimeAxisViewItem */