set the id in wxMouseEvent (bug 484245)

[wxWidgets.git] / src / msw / ole / dropsrc.cpp

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 4a38d8125f7d2b581b8a2eb6b781dade5cdf478a..6aae42c5d549cb91c1da54caf4257a5131128b64 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -27,20 +27,26 @@
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif

+#ifndef WX_PRECOMP
+#include "wx/window.h"
+#endif

 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_OLE && wxUSE_DRAG_AND_DROP

 
 #include "wx/log.h"
 
 #include "wx/log.h"

-#include "wx/dataobj.h"
-#include "wx/msw/ole/dropsrc.h"
+#include "wx/dnd.h"

 
 #include <windows.h>
 
 
 #include <windows.h>
 

+#if wxUSE_NORLANDER_HEADERS
+    #include <ole2.h>
+#endif
+

 #ifndef __WIN32__
 #ifndef __WIN32__

-  #include <ole2.h>
-  #include <olestd.h>
+    #include <ole2.h>
+    #include <olestd.h>

 #endif
 
 #include <oleauto.h>
 #endif
 
 #include <oleauto.h>


@@ -134,8 +140,7 @@ STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect)
   else
     effect = wxDragNone;
 
   else
     effect = wxDragNone;
 

-  if ( m_pDropSource->GiveFeedback(effect,
-                                   (dwEffect & DROPEFFECT_SCROLL) != 0 ) )
+  if ( m_pDropSource->GiveFeedback(effect) )

     return S_OK;
 
   return DRAGDROP_S_USEDEFAULTCURSORS;
     return S_OK;
 
   return DRAGDROP_S_USEDEFAULTCURSORS;


@@ -150,46 +155,50 @@ STDMETHODIMP wxIDropSource::GiveFeedback(DWORD dwEffect)
 // common part of all ctors
 void wxDropSource::Init()
 {
 // 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))
+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, wxWindow* WXUNUSED(win))
+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()
 {
 }
 
 wxDropSource::~wxDropSource()
 {

-  m_pIDropSource->Release();
+    m_pIDropSource->Release();

 }
 
 // Name    : DoDragDrop
 // Purpose : start drag and drop operation
 // Returns : wxDragResult - the code of performed operation
 }
 
 // Name    : DoDragDrop
 // Purpose : start drag and drop operation
 // Returns : wxDragResult - the code of performed operation

-// Params  : [in] bool bAllowMove: if false, only copy is allowed
+// Params  : [in] int flags: specifies if moving is allowe (or only copying)

 // Notes   : you must call SetData() before if you had used def ctor
 // Notes   : you must call SetData() before if you had used def ctor

-wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
+wxDragResult wxDropSource::DoDragDrop(int flags)

 {
 {

-  wxCHECK_MSG( m_pData != NULL, wxDragNone, _T("No data in wxDropSource!") );
+  wxCHECK_MSG( m_data != NULL, wxDragNone, wxT("No data in wxDropSource!") );

 
   DWORD dwEffect;
 
   DWORD dwEffect;

-  HRESULT hr = ::DoDragDrop(m_pData->GetInterface(),
+  HRESULT hr = ::DoDragDrop(m_data->GetInterface(),

                             m_pIDropSource,
                             m_pIDropSource,

-                            bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE
-                                       : DROPEFFECT_COPY,
+                            (flags & wxDrag_AllowMove)
+                                ? DROPEFFECT_COPY | DROPEFFECT_MOVE
+                                : DROPEFFECT_COPY,

                             &dwEffect);
 
   if ( hr == DRAGDROP_S_CANCEL ) {
                             &dwEffect);
 
   if ( hr == DRAGDROP_S_CANCEL ) {


@@ -201,11 +210,8 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
     }
     else if ( dwEffect & DROPEFFECT_MOVE ) {
       // consistency check: normally, we shouldn't get "move" at all
     }
     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 wxDragMove;
-      else
-        return wxDragCopy;
+      // 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
     }
     else {
       // not copy or move


@@ -214,11 +220,12 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
   }
   else {
     if ( FAILED(hr) ) {
   }
   else {
     if ( FAILED(hr) ) {

-      wxLogApiError("DoDragDrop", hr);
-      wxLogError(_T("Drag & drop operation failed."));
+      wxLogApiError(wxT("DoDragDrop"), hr);
+      wxLogError(wxT("Drag & drop operation failed."));

     }
     else {
     }
     else {

-      wxLogDebug(_T("Unexpected success return code %08lx from DoDragDrop."), hr);
+      wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."),
+                 hr);

     }
 
     return wxDragError;
     }
 
     return wxDragError;


@@ -229,11 +236,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
 // 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
 // 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
 }
 
 #endif  //USE_DRAG_AND_DROP