makeg95.env edited for Mingw32/gcc 2.95 compilation; _T not redefined for

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

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 4a38d8125f7d2b581b8a2eb6b781dade5cdf478a..6e6e2886d5c899c0b7b236a89f3877f45fccfbad 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -27,6 +27,9 @@
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif
+#ifndef WX_PRECOMP
+#include "wx/window.h"
+#endif
 
 #include "wx/setup.h"
 
@@ -37,6 +40,9 @@
 #include "wx/msw/ole/dropsrc.h"
 
 #include <windows.h>
+#ifdef wxUSE_NORLANDER_HEADERS
+#include <ole2.h>
+#endif
 
 #ifndef __WIN32__
   #include <ole2.h>
@@ -183,7 +189,7 @@ 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, _T("No data in wxDropSource!") );
+  wxCHECK_MSG( m_pData != NULL, wxDragNone, wxT("No data in wxDropSource!") );
 
   DWORD dwEffect;
   HRESULT hr = ::DoDragDrop(m_pData->GetInterface(),
@@ -215,10 +221,10 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
   else {
     if ( FAILED(hr) ) {
       wxLogApiError("DoDragDrop", hr);
-      wxLogError(_T("Drag & drop operation failed."));
+      wxLogError(wxT("Drag & drop operation failed."));
     }
     else {
-      wxLogDebug(_T("Unexpected success return code %08lx from DoDragDrop."), hr);
+      wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."), hr);
     }
 
     return wxDragError;