an assert added to check that we're not doing something stupid

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 1e381bfb5654bb9ede37445f562f16ef7667c2ae..4a38d8125f7d2b581b8a2eb6b781dade5cdf478a 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -2,7 +2,7 @@
 // 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 <zeitlin@dptmaths.ens-cachan.fr>
@@ -28,20 +28,25 @@
   #pragma hdrstop
 #endif
 
-#include  <wx/setup.h>
+#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 "wx/log.h"
+#include "wx/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
 // ----------------------------------------------------------------------------
@@ -116,7 +121,7 @@ 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)
@@ -178,11 +183,11 @@ wxDropSource::~wxDropSource()
 // Notes   : you must call SetData() before if you had used def ctor
 wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
 {
-  wxCHECK_MSG( m_pData != NULL, wxDragNone, "No data in wxDropSource!" );
+  wxCHECK_MSG( m_pData != NULL, wxDragNone, _T("No data in wxDropSource!") );
 
   DWORD dwEffect;
-  HRESULT hr = ::DoDragDrop(m_pData->GetInterface(), 
-                            m_pIDropSource, 
+  HRESULT hr = ::DoDragDrop(m_pData->GetInterface(),
+                            m_pIDropSource,
                             bAllowMove ? DROPEFFECT_COPY | DROPEFFECT_MOVE
                                        : DROPEFFECT_COPY,
                             &dwEffect);
@@ -210,10 +215,10 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
   else {
     if ( FAILED(hr) ) {
       wxLogApiError("DoDragDrop", hr);
-      wxLogError("Drag & drop operation failed.");
+      wxLogError(_T("Drag & drop operation failed."));
     }
     else {
-      wxLogDebug("Unexpected success return code %08lx from DoDragDrop.", hr);
+      wxLogDebug(_T("Unexpected success return code %08lx from DoDragDrop."), hr);
     }
 
     return wxDragError;
@@ -224,7 +229,7 @@ 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
-//           [in] bool bScrolling   - true if target is scrolling    
+//           [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)
 {