More settings restored.

[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..413155dd2443bc8b92aa8d14945e14cf3696b5a1 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -22,6 +22,7 @@
 
 // get IUnknown, REFIID &c
 #include <ole2.h>
+#include "wx/intl.h"
 
 // ============================================================================
 // General purpose functions and macros
@@ -196,11 +197,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 +230,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) ;