linux packaging: ignore QT4 dependency

[ardour.git] / gtk2_ardour / editor_drag.h

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index aec672d92f2ed5379d61bab436bab739794d048b..c25c24839bb0f5500be45b63ad1a48452f703857 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -29,6 +29,7 @@
 
 #include "cursor_context.h"
 #include "editor_items.h"
+#include "mouse_cursors.h"
 
 namespace ARDOUR {
        class Location;
@@ -58,8 +59,8 @@ public:
 
        void abort ();
        void add (Drag *);
-       void set (Drag *, GdkEvent *, Gdk::Cursor* c = 0);
-       void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
+       void set (Drag *, GdkEvent *, Gdk::Cursor* c = MouseCursors::invalid_cursor());
+       void start_grab (GdkEvent *, Gdk::Cursor* c = MouseCursors::invalid_cursor());
        bool end_grab (GdkEvent *);
        bool have_item (ArdourCanvas::Item *) const;
 
@@ -177,6 +178,10 @@ public:
                return true;
        }
 
+       bool initially_vertical() const {
+               return _initially_vertical;
+       }
+       
        /** Set up the _pointer_frame_offset */
        virtual void setup_pointer_frame_offset () {
                _pointer_frame_offset = 0;
@@ -234,6 +239,7 @@ private:
        bool _trackview_only; ///< true if pointer y value should always be relative to the top of the trackview group
        bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false
        bool _starting_point_passed; ///< true if we called move () with first_move flag, otherwise false
+       bool _initially_vertical; ///< true if after move threshold is passed we appear to be moving vertically; undefined before that
         bool _was_double_click; ///< true if drag initiated by a double click event
        double _grab_x; ///< trackview x of the grab start position
        double _grab_y; ///< y of the grab start position, possibly adjusted if _trackview_only is true
@@ -327,6 +333,7 @@ protected:
        double _total_x_delta;
        int _last_pointer_time_axis_view;
        double _last_pointer_layer;
+       bool _single_axis;
 };
 
 
@@ -994,7 +1001,8 @@ public:
        };
 
        RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation);
-
+       ~RangeMarkerBarDrag ();
+       
        void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
        void motion (GdkEvent *, bool);
        void finished (GdkEvent *, bool);