Fix compilation warnings. (gtk2_ardour part)

[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 6827251472b8fe9ee09f37a8b348b27eba10eb4b..4be23803efe424608df596633ac3f3ee3e6ebe2d 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -142,7 +142,13 @@ class TimeAxisView : public virtual AxisView
        virtual void entered () {}
        virtual void exited () {}
 
-       virtual void set_height (uint32_t h);
+       enum TrackHeightMode {
+               OnlySelf,
+               TotalHeight,
+               HeightPerLane
+       };
+
+       virtual void set_height (uint32_t h, TrackHeightMode m = OnlySelf);
        void set_height_enum (Height, bool apply_to_selection = false);
        void reset_height();
 
@@ -251,8 +257,11 @@ class TimeAxisView : public virtual AxisView
        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);