Removed my buggy bug-fix

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 024b37defcd56ca50562d9b854eb784be03315c0..7a434d08f1c208bca413bfeeace7040346a8217a 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -30,18 +30,23 @@
 
 #include  <wx/setup.h>
 
-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
 
 #include  <wx/log.h>
-#include  <wx/msw/ole/oleutils.h>
 #include  <wx/msw/ole/dataobj.h>
 #include  <wx/msw/ole/dropsrc.h>
 
+#include <windows.h>
+
 #ifndef __WIN32__
   #include <ole2.h>
   #include <olestd.h>
 #endif
 
+#include <oleauto.h>
+
+#include <wx/msw/ole/oleutils.h>
+
 // ----------------------------------------------------------------------------
 // wxIDropSource implementation of IDropSource interface
 // ----------------------------------------------------------------------------
@@ -121,13 +126,13 @@ STDMETHODIMP wxIDropSource::QueryContinueDrag(BOOL fEscapePressed,
 // 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 ) )
@@ -149,13 +154,13 @@ void wxDropSource::Init()
   m_pIDropSource->AddRef();
 }
 
-wxDropSource::wxDropSource()
+wxDropSource::wxDropSource(wxWindow* WXUNUSED(win))
 {
   Init();
   m_pData = NULL;
 }
 
-wxDropSource::wxDropSource(wxDataObject& data)
+wxDropSource::wxDropSource(wxDataObject& data, wxWindow* WXUNUSED(win))
 {
   Init();
   SetData(data);
@@ -173,12 +178,12 @@ wxDropSource::~wxDropSource()
 
 // Name    : DoDragDrop
 // Purpose : start drag and drop operation
-// Returns : DragResult - the code of performed operation
+// Returns : wxDragResult - the code of performed operation
 // Params  : [in] bool bAllowMove: if false, only copy is allowed
 // Notes   : you must call SetData() before if you had used def ctor
-wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
+wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
 {
-  wxCHECK_RET( m_pData != NULL, None );
+  wxCHECK_MSG( m_pData != NULL, wxDragNone, "No data in wxDropSource!" );
 
   DWORD dwEffect;
   HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), 
@@ -188,23 +193,23 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
                             &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;
+        return wxDragMove;
       else
-        return Copy;
+        return wxDragCopy;
     }
     else {
       // not copy or move
-      return None;
+      return wxDragNone;
     }
   }
   else {
@@ -216,7 +221,7 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
       wxLogDebug("Unexpected success return code %08lx from DoDragDrop.", hr);
     }
 
-    return Error;
+    return wxDragError;
   }
 }
 
@@ -226,9 +231,9 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
 // 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, bool bScrolling)
 {
-  return false;
+  return FALSE;
 }
 
-#endif  //USE_DRAG_AND_DROP
\ No newline at end of file
+#endif  //USE_DRAG_AND_DROP