Merge branch 'master' into webview_script_message

2021-03-01 09:57:13 +01:00
parent 5e35e6c635 401d547b2a
commit 80c04e3941
23 changed files with 477 additions and 296 deletions
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -1270,10 +1270,10 @@ void DnDFrame::OnUsePrimary(wxCommandEvent& event)

 #if wxUSE_DRAG_AND_DROP

-void DnDFrame::OnBeginDrag(wxTreeEvent& WXUNUSED(event))
+void DnDFrame::OnBeginDrag(wxTreeEvent& event)
 {
    wxFileDataObject data;
-    data.AddFile(m_ctrlDir->GetPath());
+    data.AddFile(m_ctrlDir->GetPath(event.GetItem()));

    wxDropSource dragSource(this);
    dragSource.SetData(data);