X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..de5ae7c6e6bd3ac764d3552a9e6fd4a287f01299:/src/msw/ole/dropsrc.cpp diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index e6955bad07..a36ac856da 100644 --- a/src/msw/ole/dropsrc.cpp +++ b/src/msw/ole/dropsrc.cpp @@ -2,7 +2,7 @@ // Name: msw/ole/dropsrc.cpp // Purpose: implementation of wxIDropSource and wxDropSource // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 10.05.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -28,20 +28,25 @@ #pragma hdrstop #endif -#include +#include "wx/setup.h" #if wxUSE_DRAG_AND_DROP -#include -#include -#include -#include +#include "wx/log.h" +#include "wx/dataobj.h" +#include "wx/msw/ole/dropsrc.h" + +#include #ifndef __WIN32__ #include #include #endif +#include + +#include "wx/msw/ole/oleutils.h" + // ---------------------------------------------------------------------------- // wxIDropSource implementation of IDropSource interface // ---------------------------------------------------------------------------- @@ -116,7 +121,7 @@ STDMETHODIMP wxIDropSource::QueryContinueDrag(BOOL fEscapePressed, // Name : wxIDropSource::GiveFeedback // Purpose : give UI feedback according to current state of operation -// Returns : STDMETHODIMP +// Returns : STDMETHODIMP // Params : [in] DWORD dwEffect - what would happen if we dropped now // Notes : default implementation is ok in more than 99% of cases STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect) @@ -181,8 +186,8 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove) wxCHECK_MSG( m_pData != NULL, wxDragNone, "No data in wxDropSource!" ); DWORD dwEffect; - HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), - m_pIDropSource, + HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), + m_pIDropSource, bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE : DROPEFFECT_COPY, &dwEffect); @@ -224,7 +229,7 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove) // Purpose : visually inform the user about d&d operation state // Returns : bool: true if we do all ourselves or false for default feedback // Params : [in] DragResult effect - what would happen if we dropped now -// [in] bool bScrolling - true if target is scrolling +// [in] bool bScrolling - true if target is scrolling // Notes : here we just leave this stuff for default implementation bool wxDropSource::GiveFeedback(wxDragResult effect, bool bScrolling) {