X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/msw/ole/dropsrc.cpp?ds=sidebyside diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index 2943fd55d7..9aa2b238c5 100644 --- a/src/msw/ole/dropsrc.cpp +++ b/src/msw/ole/dropsrc.cpp @@ -33,20 +33,20 @@ #include "wx/setup.h" -#if wxUSE_DRAG_AND_DROP +#if wxUSE_OLE && wxUSE_DRAG_AND_DROP #include "wx/log.h" -#include "wx/dataobj.h" -#include "wx/msw/ole/dropsrc.h" +#include "wx/dnd.h" #include -#ifdef wxUSE_NORLANDER_HEADERS -#include + +#if wxUSE_NORLANDER_HEADERS + #include #endif #ifndef __WIN32__ - #include - #include + #include + #include #endif #include @@ -140,8 +140,7 @@ STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect) else effect = wxDragNone; - if ( m_pDropSource->GiveFeedback(effect, - (dwEffect & DROPEFFECT_SCROLL) != 0 ) ) + if ( m_pDropSource->GiveFeedback(effect) ) return S_OK; return DRAGDROP_S_USEDEFAULTCURSORS; @@ -156,30 +155,33 @@ STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect) // common part of all ctors void wxDropSource::Init() { - m_pIDropSource = new wxIDropSource(this); - m_pIDropSource->AddRef(); -} - -wxDropSource::wxDropSource(wxWindow* WXUNUSED(win)) -{ - Init(); - m_pData = NULL; + m_pIDropSource = new wxIDropSource(this); + m_pIDropSource->AddRef(); } -wxDropSource::wxDropSource(wxDataObject& data, wxWindow* WXUNUSED(win)) +wxDropSource::wxDropSource(wxWindow* WXUNUSED(win), + const wxCursor &cursorCopy, + const wxCursor &cursorMove, + const wxCursor &cursorStop) + : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - Init(); - SetData(data); + Init(); } -void wxDropSource::SetData(wxDataObject& data) +wxDropSource::wxDropSource(wxDataObject& data, + wxWindow* WXUNUSED(win), + const wxCursor &cursorCopy, + const wxCursor &cursorMove, + const wxCursor &cursorStop) + : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - m_pData = &data; + Init(); + SetData(data); } wxDropSource::~wxDropSource() { - m_pIDropSource->Release(); + m_pIDropSource->Release(); } // Name : DoDragDrop @@ -189,10 +191,10 @@ 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, T("No data in wxDropSource!") ); + wxCHECK_MSG( m_data != NULL, wxDragNone, wxT("No data in wxDropSource!") ); DWORD dwEffect; - HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), + HRESULT hr = ::DoDragDrop(m_data->GetInterface(), m_pIDropSource, bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE : DROPEFFECT_COPY, @@ -220,11 +222,12 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove) } else { if ( FAILED(hr) ) { - wxLogApiError("DoDragDrop", hr); - wxLogError(T("Drag & drop operation failed.")); + wxLogApiError(wxT("DoDragDrop"), hr); + wxLogError(wxT("Drag & drop operation failed.")); } else { - wxLogDebug(T("Unexpected success return code %08lx from DoDragDrop."), hr); + wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."), + hr); } return wxDragError; @@ -235,11 +238,20 @@ 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 // Notes : here we just leave this stuff for default implementation -bool wxDropSource::GiveFeedback(wxDragResult effect, bool bScrolling) +bool wxDropSource::GiveFeedback(wxDragResult effect) { - return FALSE; + const wxCursor& cursor = GetCursor(effect); + if ( cursor.Ok() ) + { + ::SetCursor((HCURSOR)cursor.GetHCURSOR()); + + return TRUE; + } + else + { + return FALSE; + } } #endif //USE_DRAG_AND_DROP