fix merge conflict with master

[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 7dc3ba9494b96403d86bbd79210ba3efbff9bf59..a22ba9443959d12be288aeb8d7b9f345cd0d6533 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -212,6 +212,7 @@ class TimeAxisView : public virtual AxisView
        Gtk::Menu*             display_menu; /* The standard LHS Track control popup-menus */
        TimeAxisView*          parent;
        ArdourCanvas::Group*   selection_group;
+       ArdourCanvas::Group*  _ghost_group;
        std::list<GhostRegion*> ghosts;
        std::list<SelectionRect*> free_selection_rects;
        std::list<SelectionRect*> used_selection_rects;
@@ -284,7 +285,6 @@ private:
        double               _resize_drag_start;
        GdkCursor*           _preresize_cursor;
        bool                 _have_preresize_cursor;
-       ArdourCanvas::Group* _ghost_group;
         bool                  _ebox_release_can_act;
 
        static uint32_t button_height;