NOOP, remove trailing tabs/whitespace.

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

diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
index cc9d1c14635737e8073a244d3b9e9a16650284d7..083fee6378a861330941c6602a349ab663e950f0 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
+++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,17 +26,19 @@
 #include <gtkmm/treeselection.h>
 #include <gtkmm/selectiondata.h>
 
+#include "gtkmm2ext/visibility.h"
+
 namespace Gtkmm2ext {
 
 template<class DataType>
-struct SerializedObjectPointers {
+struct /*LIBGTKMM2EXT_API*/ SerializedObjectPointers {
     uint32_t size;
     uint32_t cnt;
     char     type[32];
     DataType data[0];
 };
 
-class DnDTreeViewBase : public Gtk::TreeView 
+class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView
 {
   private:
   public:
@@ -45,7 +47,12 @@ 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();
                TreeView::on_drag_leave (context, time);
@@ -65,11 +72,13 @@ class DnDTreeViewBase : public Gtk::TreeView
        std::string                 object_type;
 
        struct DragData {
+           DragData () : source (0) {}
+
            Gtk::TreeView* source;
            int            data_column;
            std::string    object_type;
        };
-       
+
        static DragData drag_data;
 
        void start_object_drag () {
@@ -80,13 +89,13 @@ class DnDTreeViewBase : public Gtk::TreeView
 };
 
 template<class DataType>
-class DnDTreeView : public DnDTreeViewBase
+class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase
 {
   public:
-       DnDTreeView() {} 
+       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 +104,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.
                         */
@@ -105,7 +112,7 @@ class DnDTreeView : public DnDTreeViewBase
                        selection_data.set (8, (guchar*)&c, 1);
                }
        }
-       
+
        void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time) {
                if (suggested_action) {
                        /* this is a drag motion callback. just update the status to
@@ -115,15 +122,15 @@ class DnDTreeView : public DnDTreeViewBase
                        TreeView::on_drag_data_received (context, x, y, selection_data, info, time);
                        return;
                }
-               
+
                if (selection_data.get_target() == "GTK_TREE_MODEL_ROW") {
-                       
+
                        TreeView::on_drag_data_received (context, x, y, selection_data, info, time);
-                       
+
 
                } 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,33 +138,38 @@ 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 ();
-               
+
                for (Gtk::TreeSelection::ListHandle_Path::iterator x = selection.begin(); x != selection.end(); ++x) {
                        model->get_iter (*x)->get_value (drag_data.data_column, v);
                        l.push_back (v);
                }
-               
+
                *source = drag_data.source;
        }
 
   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);
        }
 
 };
 
 } // namespace
- 
+
 #endif /* __gtkmm2ext_dndtreeview_h__ */