diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-20 16:24:24 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-20 16:24:24 +0000 |
commit | 41bc62b35b8194fd607aa2541e2057abd680078a (patch) | |
tree | 6f49ccdc649438f75eb7beb9a2019d94a94fbf37 /libs/gtkmm2ext/dndtreeview.cc | |
parent | d89e7ff299727139f98c9b1a72d93ca538bdb177 (diff) |
fixes for drag-n-drop broken by use of boost::shared_ptr<T>
git-svn-id: svn://localhost/ardour2/trunk@923 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/dndtreeview.cc')
-rw-r--r-- | libs/gtkmm2ext/dndtreeview.cc | 85 |
1 files changed, 5 insertions, 80 deletions
diff --git a/libs/gtkmm2ext/dndtreeview.cc b/libs/gtkmm2ext/dndtreeview.cc index 83955861cf..7baedd4121 100644 --- a/libs/gtkmm2ext/dndtreeview.cc +++ b/libs/gtkmm2ext/dndtreeview.cc @@ -10,7 +10,7 @@ using namespace Gtk; using namespace Glib; using namespace Gtkmm2ext; -DnDTreeView::DnDTreeView () +DnDTreeViewBase::DnDTreeViewBase () : TreeView () { draggable.push_back (TargetEntry ("GTK_TREE_MODEL_ROW", TARGET_SAME_WIDGET)); @@ -23,7 +23,7 @@ DnDTreeView::DnDTreeView () } void -DnDTreeView::add_drop_targets (list<TargetEntry>& targets) +DnDTreeViewBase::add_drop_targets (list<TargetEntry>& targets) { for (list<TargetEntry>::iterator i = targets.begin(); i != targets.end(); ++i) { draggable.push_back (*i); @@ -33,7 +33,7 @@ DnDTreeView::add_drop_targets (list<TargetEntry>& targets) } void -DnDTreeView::add_object_drag (int column, string type_name) +DnDTreeViewBase::add_object_drag (int column, string type_name) { draggable.push_back (TargetEntry (type_name, TargetFlags(0))); data_column = column; @@ -42,86 +42,11 @@ DnDTreeView::add_object_drag (int column, string type_name) enable_model_drag_dest (draggable); } -DnDTreeView::SerializedObjectPointers* -DnDTreeView::serialize_pointers (RefPtr<TreeModel> model, TreeSelection::ListHandle_Path* selection, ustring type) -{ - uint32_t cnt = selection->size(); - uint32_t sz = (sizeof (void*) * cnt) + sizeof (SerializedObjectPointers); - - cerr << "lets plan to serialize " << cnt << " from selection\n"; - - char* buf = new char[sz]; - SerializedObjectPointers* sr = new (buf) SerializedObjectPointers; - - sr->cnt = cnt; - sr->size = sz; - - snprintf (sr->type, sizeof (sr->type), "%s", type.c_str()); - - cnt = 0; - - for (TreeSelection::ListHandle_Path::iterator x = selection->begin(); x != selection->end(); ++x, ++cnt) { - cerr << "getting next item\n"; - TreeModel::Row row = *(model->get_iter (*x)); - row.get_value (data_column, sr->ptr[cnt]); - } - - cerr << "returning an SR with size = " << sr->size << endl; - return sr; -} - -void -DnDTreeView::on_drag_data_get(const RefPtr<DragContext>& context, SelectionData& selection_data, guint info, guint time) -{ - if (selection_data.get_target() == "GTK_TREE_MODEL_ROW") { - - TreeView::on_drag_data_get (context, selection_data, info, time); - - } else if (data_column >= 0) { - - Gtk::TreeSelection::ListHandle_Path selection = get_selection()->get_selected_rows (); - SerializedObjectPointers* sr = serialize_pointers (get_model(), &selection, selection_data.get_target()); - selection_data.set (8, (guchar*)sr, sr->size); - - cerr << "selection data set to contain " << sr->size << endl; - } -} - -void -DnDTreeView::on_drag_data_received(const RefPtr<DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time) -{ - if (suggested_action) { - /* this is a drag motion callback. just update the status to - say that we are still dragging, and that's it. - */ - suggested_action = Gdk::DragAction (0); - 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 (data_column >= 0) { - - /* object D-n-D */ - - const SerializedObjectPointers* sr = reinterpret_cast<const SerializedObjectPointers *>(selection_data.get_data()); - - if (sr) { - signal_object_drop (sr->type, sr->cnt, const_cast<void**>(sr->ptr)); - } - - } else { - /* some kind of target type added by the app, which will be handled by a signal handler */ - } -} - bool -DnDTreeView::on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time) +DnDTreeViewBase::on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time) { suggested_action = Gdk::DragAction (0); return TreeView::on_drag_drop (context, x, y, time); } + |