avoid warnings C4311/4312 when building with MSVC >= 7 (patch 1414052)

[wxWidgets.git] / include / wx / msw / ole / oleutils.h

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 399a39f269bd46e4a5fdbdc90750bcf8a4da4600..50286a3c404c52abd3261b0f59cd4aae1a0a4805 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -12,16 +12,16 @@
 #ifndef   _WX_OLEUTILS_H
 #define   _WX_OLEUTILS_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "oleutils.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_OLE
 
+// ole2.h includes windows.h, so include wrapwin.h first
+#include "wx/msw/wrapwin.h"
 // get IUnknown, REFIID &c
 #include <ole2.h>
+#include "wx/intl.h"
+#include "wx/log.h"
 
 // ============================================================================
 // General purpose functions and macros
@@ -196,11 +196,11 @@ void wxLogQueryInterface(const wxChar *szInterface, REFIID riid);
 void wxLogAddRef (const wxChar *szInterface, ULONG cRef);
 void wxLogRelease(const wxChar *szInterface, ULONG cRef);
 
-#else   //!WXDEBUG
+#else   //!__WXDEBUG__
   #define   wxLogQueryInterface(szInterface, riid)
   #define   wxLogAddRef(szInterface, cRef)
   #define   wxLogRelease(szInterface, cRef)
-#endif  //WXDEBUG
+#endif  //__WXDEBUG__
 
 // wrapper around BSTR type (by Vadim Zeitlin)
 
@@ -229,7 +229,7 @@ private:
 };
 
 // Convert variants
-class WXDLLEXPORT wxVariant;
+class WXDLLIMPEXP_BASE wxVariant;
 
 bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
 bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;
@@ -252,4 +252,3 @@ inline void wxOleUninitialize() { }
 #endif // wxUSE_OLE/!wxUSE_OLE
 
 #endif  //_WX_OLEUTILS_H
-