X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17b74d79adcc7bbd5cff4ed500e267289c0083a7..7309b92dd71901b8c96dea3e48e57a6c21d072a4:/src/msw/ole/dropsrc.cpp diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index 7a434d08f1..4a38d8125f 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,13 +28,13 @@ #pragma hdrstop #endif -#include +#include "wx/setup.h" #if wxUSE_DRAG_AND_DROP -#include -#include -#include +#include "wx/log.h" +#include "wx/dataobj.h" +#include "wx/msw/ole/dropsrc.h" #include @@ -45,7 +45,7 @@ #include -#include +#include "wx/msw/ole/oleutils.h" // ---------------------------------------------------------------------------- // wxIDropSource implementation of IDropSource interface @@ -121,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) @@ -183,11 +183,11 @@ wxDropSource::~wxDropSource() // Notes : you must call SetData() before if you had used def ctor wxDragResult wxDropSource::DoDragDrop(bool bAllowMove) { - wxCHECK_MSG( m_pData != NULL, wxDragNone, "No data in wxDropSource!" ); + wxCHECK_MSG( m_pData != NULL, wxDragNone, _T("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); @@ -215,10 +215,10 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove) else { if ( FAILED(hr) ) { wxLogApiError("DoDragDrop", hr); - wxLogError("Drag & drop operation failed."); + wxLogError(_T("Drag & drop operation failed.")); } else { - wxLogDebug("Unexpected success return code %08lx from DoDragDrop.", hr); + wxLogDebug(_T("Unexpected success return code %08lx from DoDragDrop."), hr); } return wxDragError; @@ -229,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) {