diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-05-16 02:51:17 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-05-16 02:51:17 +0000 |
| commit | ace07c80a81a631eb8ff95155e5ace2751838809 (patch) | |
| tree | 4e440b7878535f04561dbddbe3ae4848a3207840 /libs/gtkmm2ext | |
| parent | 86dda29be798073d3d8b08aa833b52773b41daad (diff) | |
a gadzillion changes all over the place. nothing is finished, but all is better than it was. more to come on all almost everything touched by this commit, this is purely a sync-to-repository. compiles and runs, but now incompatible with all previous 3.0 session files (probably)
git-svn-id: svn://localhost/ardour2/branches/3.0@5084 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext')
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/dndtreeview.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h index 085e500f21..cc9d1c1463 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h @@ -86,7 +86,7 @@ class DnDTreeView : public DnDTreeViewBase DnDTreeView() {} ~DnDTreeView() {} - sigc::signal<void,const std::list<DataType>& > signal_drop; + sigc::signal<void,const std::list<DataType>&,Gtk::TreeView*,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") { @@ -123,7 +123,7 @@ class DnDTreeView : public DnDTreeViewBase } else if (selection_data.get_target() == object_type) { - end_object_drag (); + end_object_drag (const_cast<Glib::RefPtr<Gdk::DragContext>& > (context)); } else { /* some kind of target type added by the app, which will be handled by a signal handler */ @@ -135,7 +135,7 @@ class DnDTreeView : public DnDTreeViewBase * object that wants to get the list of dragged items. */ - void get_object_drag_data (std::list<DataType>& l) { + void get_object_drag_data (std::list<DataType>& l, Gtk::TreeView** source) { 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 (); @@ -144,13 +144,16 @@ class DnDTreeView : public DnDTreeViewBase model->get_iter (*x)->get_value (drag_data.data_column, v); l.push_back (v); } + + *source = drag_data.source; } private: - void end_object_drag () { + void end_object_drag (Glib::RefPtr<Gdk::DragContext>& context) { std::list<DataType> l; - get_object_drag_data (l); - signal_drop (l); + Gtk::TreeView* source; + get_object_drag_data (l, &source); + signal_drop (l, source, context); } }; |