X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5639a8767db96e9126c7223ccab388dcb4872d5..1cff04deb5c17c95bef9c83e72645f105b90e750:/src/msw/ole/droptgt.cpp diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index 8bc18646cd..c24f6e5ae6 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -85,6 +85,8 @@ protected: // get default drop effect for given keyboard flags static inline DWORD GetDropEffect(DWORD flags); + + DECLARE_NO_COPY_CLASS(wxIDropTarget) }; // ---------------------------------------------------------------------------- @@ -113,7 +115,6 @@ DWORD wxIDropTarget::GetDropEffect(DWORD flags) wxIDropTarget::wxIDropTarget(wxDropTarget *pTarget) { - m_cRef = 0; m_pTarget = pTarget; m_pIDataObject = NULL; } @@ -148,7 +149,7 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource, _T("drop target must have data object") ); // show the list of formats supported by the source data object for the - // debugging purposes + // debugging purposes, this is quite useful sometimes - please don't remove #if 0 IEnumFORMATETC *penumFmt; if ( SUCCEEDED(pIDataSource->EnumFormatEtc(DATADIR_GET, &penumFmt)) ) @@ -402,11 +403,11 @@ bool wxDropTarget::GetData() rc = TRUE; } else { - wxLogLastError(wxT("IDataObject::SetData()")); + wxLogApiError(wxT("IDataObject::SetData()"), hr); } } else { - wxLogLastError(wxT("IDataObject::GetData()")); + wxLogApiError(wxT("IDataObject::GetData()"), hr); } return rc; @@ -484,6 +485,9 @@ static wxDragResult ConvertDragEffectToResult(DWORD dwEffect) case DROPEFFECT_COPY: return wxDragCopy; + case DROPEFFECT_LINK: + return wxDragLink; + case DROPEFFECT_MOVE: return wxDragMove; @@ -502,6 +506,9 @@ static DWORD ConvertDragResultToEffect(wxDragResult result) case wxDragCopy: return DROPEFFECT_COPY; + case wxDragLink: + return DROPEFFECT_LINK; + case wxDragMove: return DROPEFFECT_MOVE;