fix background of ArdourButtons with no Body

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 4be23803efe424608df596633ac3f3ee3e6ebe2d..1920d668a72e40f7b25f3b698bdbeb20a8720c43 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -39,7 +39,9 @@
 #include "pbd/signals.h"
 
 #include "ardour/types.h"
+#include "ardour/presentation_info.h"
 #include "ardour/region.h"
+
 #include "evoral/Parameter.hpp"
 
 #include "canvas/line.h"
@@ -55,6 +57,7 @@ namespace ARDOUR {
        class Session;
        class RouteGroup;
        class Playlist;
+       class Stripable;
 }
 
 namespace Gtk {
@@ -102,6 +105,9 @@ class TimeAxisView : public virtual AxisView
 
        static void setup_sizes ();
 
+       virtual boost::shared_ptr<ARDOUR::Stripable> stripable() const = 0;
+       virtual ARDOUR::PresentationInfo const & presentation_info () const = 0;
+
        /** @return index of this TimeAxisView within its parent */
        int order () const { return _order; }
 
@@ -133,7 +139,7 @@ class TimeAxisView : public virtual AxisView
        /** @return true if hidden, otherwise false */
        bool hidden () const { return _hidden; }
 
-       void set_selected (bool);
+       virtual bool selectable() const { return true; }
 
        /**
         * potential handler for entered events
@@ -229,9 +235,7 @@ class TimeAxisView : public virtual AxisView
        Gtk::VBox              time_axis_vbox;
        Gtk::HBox              time_axis_hbox;
        Gtk::Frame             time_axis_frame;
-       Gtk::HBox              name_hbox;
        Gtk::HBox              top_hbox;
-       Gtk::Label             name_label;
        Gtk::Fixed             scroomer_placeholder;
        bool                  _name_editing;
        uint32_t               height;  /* in canvas units */
@@ -254,20 +258,12 @@ class TimeAxisView : public virtual AxisView
 
        virtual bool can_edit_name() const;
 
-       bool name_entry_key_release (GdkEventKey *ev);
-       bool name_entry_key_press (GdkEventKey *ev);
-       bool name_entry_focus_out (GdkEventFocus *ev);
-       void name_entry_populate_popup (Gtk::Menu *);
-
-       Gtk::Entry* name_entry;
-       bool ending_name_edit;
-       bool by_popup_menu;
        void begin_name_edit ();
-       void end_name_edit (int);
+       void end_name_edit (std::string, int);
 
        /* derived classes can override these */
 
-       virtual void name_entry_changed ();
+       virtual bool name_entry_changed (std::string const&);
 
        /** Handle mouse relaese on our LHS control name ebox.
         *
@@ -310,7 +306,10 @@ class TimeAxisView : public virtual AxisView
 
        void build_size_menu ();
 
-private:
+  protected:
+       void show_selected ();
+
+  private:
        Gtk::VBox*            control_parent;
        int                  _order;
        uint32_t             _effective_height;