diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h index 50286a3c40..14818e3d7f 100644 --- a/include/wx/msw/ole/oleutils.h +++ b/include/wx/msw/ole/oleutils.h @@ -231,14 +231,14 @@ private: // Convert variants class WXDLLIMPEXP_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); // 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 diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index 86156519cb..1bccfebca1 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -544,7 +544,7 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const } -bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) +WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) { ClearVariant(&oleVariant); if (variant.IsNull()) @@ -666,7 +666,7 @@ bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) #define VT_TYPEMASK 0xfff #endif -bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) +WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) { switch (oleVariant.vt & VT_TYPEMASK) { diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 8493a938ef..6c9e409042 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -66,7 +66,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount) return false; } -BSTR wxConvertStringToOle(const wxString& str) +WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str) { /* unsigned int len = strlen((const char*) str); @@ -80,7 +80,7 @@ BSTR wxConvertStringToOle(const wxString& str) return bstr.Get(); } -wxString wxConvertStringFromOle(BSTR bStr) +WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr) { #if wxUSE_UNICODE wxString str(bStr);