X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50c375d311ac4cefbf1ae1d11e19c9e7c00a873e..2035e10e83324c6925d12725b842768f6e2b00a2:/src/msw/ole/droptgt.cpp diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index 67825f8569..c133b3d9b4 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -61,6 +61,10 @@ class wxIDropTarget : public IDropTarget { public: wxIDropTarget(wxDropTarget *p); + // suppress gcc warning +#ifdef __GNUG__ + virtual +#endif ~wxIDropTarget(); // accessors for wxDropTarget @@ -260,14 +264,11 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource, // and now it has the data wxDragResult rc = ConvertDragEffectToResult(GetDropEffect(grfKeyState)); - m_pTarget->OnData(pt.x, pt.y);//, rc); -/* + rc = m_pTarget->OnData(pt.x, pt.y, rc); if ( wxIsDragResultOk(rc) ) { // operation succeeded *pdwEffect = ConvertDragResultToEffect(rc); } -*/ - //else: *pdwEffect is already DROPEFFECT_NONE } //else: OnDrop() returned FALSE, no need to copy data