change FastMeter drawing implementation to use Cairo instead of GDK; some subtle...

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / dndtreeview.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
index cc9d1c14635737e8073a244d3b9e9a16650284d7..b5f18fa8902c7545d05c057898a07821dcf105e6 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
+++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
@@ -45,6 +45,11 @@ class DnDTreeViewBase : public Gtk::TreeView
 
        void add_drop_targets (std::list<Gtk::TargetEntry>&);
        void add_object_drag (int column, std::string type_name);
+
+       void on_drag_begin (Glib::RefPtr<Gdk::DragContext> const & context) {
+               Gtk::TreeView::on_drag_begin (context);
+               start_object_drag ();
+       }
        
        void on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time) {
                suggested_action = context->get_suggested_action();
@@ -65,6 +70,8 @@ class DnDTreeViewBase : public Gtk::TreeView
        std::string                 object_type;
 
        struct DragData {
+           DragData () : source (0) {}
+               
            Gtk::TreeView* source;
            int            data_column;
            std::string    object_type;
@@ -86,7 +93,7 @@ class DnDTreeView : public DnDTreeViewBase
        DnDTreeView() {} 
        ~DnDTreeView() {}
 
-       sigc::signal<void,const std::list<DataType>&,Gtk::TreeView*,Glib::RefPtr<Gdk::DragContext>&> signal_drop;
+       sigc::signal<void,const std::list<DataType>&,Gtk::TreeView*,int,int,Glib::RefPtr<Gdk::DragContext>&> signal_drop;
 
        void on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, Gtk::SelectionData& selection_data, guint info, guint time) {
                if (selection_data.get_target() == "GTK_TREE_MODEL_ROW") {
@@ -95,8 +102,6 @@ class DnDTreeView : public DnDTreeViewBase
 
                } else if (selection_data.get_target() == object_type) {
 
-                       start_object_drag ();
-
                        /* we don't care about the data passed around by DnD, but
                           we have to provide something otherwise it will stop.
                         */
@@ -123,7 +128,7 @@ class DnDTreeView : public DnDTreeViewBase
 
                } else if (selection_data.get_target() == object_type) {
                        
-                       end_object_drag (const_cast<Glib::RefPtr<Gdk::DragContext>& > (context));
+                       end_object_drag (const_cast<Glib::RefPtr<Gdk::DragContext>& > (context), x, y);
 
                } else {
                        /* some kind of target type added by the app, which will be handled by a signal handler */
@@ -131,11 +136,16 @@ class DnDTreeView : public DnDTreeViewBase
        }
 
        /**
-        * this can be called by the Treeview itself or by some other
+        * This can be called by the Treeview itself or by some other
         * object that wants to get the list of dragged items.
         */
 
        void get_object_drag_data (std::list<DataType>& l, Gtk::TreeView** source) {
+
+               if (drag_data.source == 0) {
+                       return;
+               }
+                       
                Glib::RefPtr<Gtk::TreeModel> model = drag_data.source->get_model();
                DataType v;
                Gtk::TreeSelection::ListHandle_Path selection = drag_data.source->get_selection()->get_selected_rows ();
@@ -149,11 +159,11 @@ class DnDTreeView : public DnDTreeViewBase
        }
 
   private:
-       void end_object_drag (Glib::RefPtr<Gdk::DragContext>& context) {
+       void end_object_drag (Glib::RefPtr<Gdk::DragContext>& context, int x, int y) {
                std::list<DataType> l;
                Gtk::TreeView* source;
                get_object_drag_data (l, &source);
-               signal_drop (l, source, context);
+               signal_drop (l, source, x, y, context);
        }
 
 };