X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eaac61c37a50b921a2f99232debc249a7acf388f..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/ole/oleutils.h?ds=sidebyside

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index b43624bee2..b70a76ade8 100644
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -12,17 +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
@@ -197,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,17 +228,19 @@ private:
     OLECHAR *m_wzBuf;     // actual string
 };
 
+#if wxUSE_VARIANT
 // Convert variants
-class WXDLLEXPORT wxVariant;
+class WXDLLIMPEXP_FWD_BASE wxVariant;
 
-bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
-bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;
+WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
+WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
+#endif // wxUSE_VARIANT
 
 // Convert string to Unicode
-BSTR wxConvertStringToOle(const wxString& str);
+WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str);
 
 // Convert string from BSTR to wxString
-wxString wxConvertStringFromOle(BSTR bStr);
+WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr);
 
 #else // !wxUSE_OLE
 
@@ -253,4 +254,3 @@ inline void wxOleUninitialize() { }
 #endif // wxUSE_OLE/!wxUSE_OLE
 
 #endif  //_WX_OLEUTILS_H
-