X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/269a5a34a6eb0f1eab66c5e09c667b66f0ac90a3..e6c3fa1bb0579e19792f58abfa13102c37813131:/src/msw/ole/dropsrc.cpp?ds=sidebyside diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index 024b37defc..7972450bd2 100644 --- a/src/msw/ole/dropsrc.cpp +++ b/src/msw/ole/dropsrc.cpp @@ -2,11 +2,11 @@ // 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 -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dropsrc.h" #endif @@ -27,21 +27,28 @@ #if defined(__BORLANDC__) #pragma hdrstop #endif +#ifndef WX_PRECOMP +#include "wx/window.h" +#endif + +#include "wx/setup.h" -#include +#if wxUSE_OLE && wxUSE_DRAG_AND_DROP -#if USE_DRAG_AND_DROP +#include "wx/log.h" +#include "wx/dnd.h" -#include -#include -#include -#include +#include "wx/msw/private.h" -#ifndef __WIN32__ - #include - #include +// for some compilers, the entire ole2.h must be included, not only oleauto.h +#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__) || defined(__WXWINCE__) + #include #endif +#include + +#include "wx/msw/ole/oleutils.h" + // ---------------------------------------------------------------------------- // wxIDropSource implementation of IDropSource interface // ---------------------------------------------------------------------------- @@ -60,6 +67,8 @@ public: private: DWORD m_grfInitKeyState; // button which started the d&d operation wxDropSource *m_pDropSource; // pointer to C++ class we belong to + + DECLARE_NO_COPY_CLASS(wxIDropSource) }; // ============================================================================ @@ -82,7 +91,6 @@ wxIDropSource::wxIDropSource(wxDropSource *pDropSource) m_pDropSource = pDropSource; m_grfInitKeyState = 0; - m_cRef = 0; } // Name : wxIDropSource::QueryContinueDrag @@ -116,21 +124,20 @@ 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) { - wxDropSource::DragResult effect; + wxDragResult effect; if ( dwEffect & DROPEFFECT_COPY ) - effect = wxDropSource::Copy; + effect = wxDragCopy; else if ( dwEffect & DROPEFFECT_MOVE ) - effect = wxDropSource::Move; + effect = wxDragMove; else - effect = wxDropSource::None; + effect = wxDragNone; - if ( m_pDropSource->GiveFeedback(effect, - (dwEffect & DROPEFFECT_SCROLL) != 0 ) ) + if ( m_pDropSource->GiveFeedback(effect) ) return S_OK; return DRAGDROP_S_USEDEFAULTCURSORS; @@ -145,78 +152,80 @@ STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect) // 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() +wxDropSource::wxDropSource(wxWindow* WXUNUSED(win), + const wxCursor &cursorCopy, + const wxCursor &cursorMove, + const wxCursor &cursorStop) + : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - Init(); - m_pData = NULL; + Init(); } -wxDropSource::wxDropSource(wxDataObject& data) +wxDropSource::wxDropSource(wxDataObject& data, + wxWindow* WXUNUSED(win), + const wxCursor &cursorCopy, + const wxCursor &cursorMove, + const wxCursor &cursorStop) + : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - Init(); - SetData(data); -} - -void wxDropSource::SetData(wxDataObject& data) -{ - m_pData = &data; + Init(); + SetData(data); } wxDropSource::~wxDropSource() { - m_pIDropSource->Release(); + m_pIDropSource->Release(); } // Name : DoDragDrop // Purpose : start drag and drop operation -// Returns : DragResult - the code of performed operation -// Params : [in] bool bAllowMove: if false, only copy is allowed +// Returns : wxDragResult - the code of performed operation +// Params : [in] int flags: specifies if moving is allowe (or only copying) // Notes : you must call SetData() before if you had used def ctor -wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove) +wxDragResult wxDropSource::DoDragDrop(int flags) { - wxCHECK_RET( m_pData != NULL, None ); + wxCHECK_MSG( m_data != NULL, wxDragNone, wxT("No data in wxDropSource!") ); DWORD dwEffect; - HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), - m_pIDropSource, - bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE - : DROPEFFECT_COPY, + HRESULT hr = ::DoDragDrop(m_data->GetInterface(), + m_pIDropSource, + (flags & wxDrag_AllowMove) + ? DROPEFFECT_COPY | DROPEFFECT_MOVE + : DROPEFFECT_COPY, &dwEffect); if ( hr == DRAGDROP_S_CANCEL ) { - return Cancel; + return wxDragCancel; } else if ( hr == DRAGDROP_S_DROP ) { if ( dwEffect & DROPEFFECT_COPY ) { - return Copy; + return wxDragCopy; } else if ( dwEffect & DROPEFFECT_MOVE ) { // consistency check: normally, we shouldn't get "move" at all - // here if !bAllowMove, but in practice it does happen quite often - if ( bAllowMove ) - return Move; - else - return Copy; + // here if we don't allow it, but in practice it does happen quite often + return (flags & wxDrag_AllowMove) ? wxDragMove : wxDragCopy; } else { // not copy or move - return None; + return wxDragNone; } } else { if ( FAILED(hr) ) { - wxLogApiError("DoDragDrop", hr); - wxLogError("Drag & drop operation failed."); + wxLogApiError(wxT("DoDragDrop"), hr); + wxLogError(wxT("Drag & drop operation failed.")); } else { - wxLogDebug("Unexpected success return code %08lx from DoDragDrop.", hr); + wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."), + hr); } - return Error; + return wxDragError; } } @@ -224,11 +233,20 @@ wxDropSource::DragResult 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(DragResult 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 \ No newline at end of file +#endif //USE_DRAG_AND_DROP