#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 <windows.h>
-#ifdef wxUSE_NORLANDER_HEADERS
-#include <ole2.h>
+
+#if wxUSE_NORLANDER_HEADERS
+ #include <ole2.h>
#endif
#ifndef __WIN32__
- #include <ole2.h>
- #include <olestd.h>
+ #include <ole2.h>
+ #include <olestd.h>
#endif
#include <oleauto.h>
else
effect = wxDragNone;
- if ( m_pDropSource->GiveFeedback(effect,
- (dwEffect & DROPEFFECT_SCROLL) != 0 ) )
+ if ( m_pDropSource->GiveFeedback(effect) )
return S_OK;
return DRAGDROP_S_USEDEFAULTCURSORS;
// common part of all ctors
void wxDropSource::Init()
{
- m_pIDropSource = new wxIDropSource(this);
- m_pIDropSource->AddRef();
+ m_pIDropSource = new wxIDropSource(this);
+ m_pIDropSource->AddRef();
}
wxDropSource::wxDropSource(wxWindow* WXUNUSED(win),
- const wxIcon & WXUNUSED(go),
- const wxIcon & WXUNUSED(stop))
+ const wxCursor &cursorCopy,
+ const wxCursor &cursorMove,
+ const wxCursor &cursorStop)
+ : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
- Init();
- m_pData = NULL;
+ Init();
}
wxDropSource::wxDropSource(wxDataObject& data,
wxWindow* WXUNUSED(win),
- const wxIcon & WXUNUSED(go),
- const wxIcon & WXUNUSED(stop))
+ const wxCursor &cursorCopy,
+ const wxCursor &cursorMove,
+ const wxCursor &cursorStop)
+ : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
- Init();
- SetData(data);
+ Init();
+ SetData(data);
}
wxDropSource::~wxDropSource()
{
- m_pIDropSource->Release();
+ m_pIDropSource->Release();
}
// Name : DoDragDrop
// Notes : you must call SetData() before if you had used def ctor
wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
{
- wxCHECK_MSG( m_pData != NULL, wxDragNone, wxT("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,
}
else {
if ( FAILED(hr) ) {
- wxLogApiError("DoDragDrop", hr);
+ wxLogApiError(wxT("DoDragDrop"), hr);
wxLogError(wxT("Drag & drop operation failed."));
}
else {
- wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."), hr);
+ wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."),
+ hr);
}
return wxDragError;
// 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