added test mode to wxLongLongWx which allowed to find the bug in operator*=()

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 6e6e2886d5c899c0b7b236a89f3877f45fccfbad..e71864e064d9aa98b0a194979b3f9501eb11582e 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -36,17 +36,17 @@
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/log.h"
 #if 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>
 
 #include <windows.h>

+

 #ifdef wxUSE_NORLANDER_HEADERS
 #ifdef wxUSE_NORLANDER_HEADERS

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

 #endif
 
 #ifndef __WIN32__
 #endif
 
 #ifndef __WIN32__

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

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


@@ -140,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;


@@ -156,30 +155,33 @@ 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();
-}
-
-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()
 {
 }
 
 wxDropSource::~wxDropSource()
 {

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

 }
 
 // Name    : DoDragDrop
 }
 
 // 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)
 {
 // 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;
 
   DWORD dwEffect;

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

                             m_pIDropSource,
                             bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE
                                        : DROPEFFECT_COPY,
                             m_pIDropSource,
                             bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE
                                        : DROPEFFECT_COPY,


@@ -224,7 +226,8 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
       wxLogError(wxT("Drag & drop operation failed."));
     }
     else {
       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;
     }
 
     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
 // 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