X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f686c274a264e89ea97505350a82c1134f307..a8f2578758be3956d1cb55503c8cb773c7c96322:/src/msw/ole/dataobj.cpp

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 2718e36bbe..d32806d9a0 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -2,7 +2,7 @@
 // Name:        msw/ole/dataobj.cpp
 // Purpose:     implementation of wx[I]DataObject class
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -32,15 +32,19 @@
 
 #if defined(__WIN32__) && !defined(__GNUWIN32__)
 
-#include  <wx/log.h>
-#include  <wx/msw/ole/oleutils.h>
-#include  <wx/msw/ole/dataobj.h>
+#include <wx/log.h>
+#include <wx/msw/ole/dataobj.h>
+
+#include <windows.h>
+#include <oleauto.h>
 
 #ifndef __WIN32__
   #include <ole2.h>
   #include <olestd.h>
 #endif
 
+#include  <wx/msw/ole/oleutils.h>
+
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
@@ -313,7 +317,7 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDirection,
     return E_NOTIMPL;
   }
 
-  wxIEnumFORMATETC *pEnum = 
+  wxIEnumFORMATETC *pEnum =
     new wxIEnumFORMATETC(m_pDataObject->GetPreferredFormat());
   pEnum->AddRef();
   *ppenumFormatEtc = pEnum;
@@ -359,7 +363,7 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
 {
 #ifdef __WXDEBUG__
   // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
-  #ifdef _MSC_VER
+  #ifdef __VISUALC__
     #pragma warning(disable:4063)
   #endif // VC++
 
@@ -386,7 +390,7 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
       return s_szBuf;
   }
 
-  #ifdef _MSC_VER
+  #ifdef __VISUALC__
     #pragma warning(default:4063)
   #endif // VC++
 
@@ -415,5 +419,7 @@ static const char *GetTymedName(DWORD tymed)
   }
 }
 
+// TODO: OLE parts of wxBitmap/File/MetafileDataObject
+
 #endif