X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94113cc55572d23b2c86b9140543d32858c1eee6..7d4f65e3939402a406be6669d2a71a3d7773c9a2:/src/msw/ole/oleutils.cpp diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index 17b768fa2b..6c9e409042 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: ole/oleutils.cpp +// Name: src/msw/ole/oleutils.cpp // Purpose: implementation of OLE helper functions // Author: Vadim Zeitlin // Modified by: @@ -24,7 +24,6 @@ #pragma hdrstop #endif -#include "wx/setup.h" #include "wx/log.h" #if wxUSE_OLE @@ -67,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); @@ -81,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); @@ -109,9 +108,9 @@ wxBasicString::wxBasicString(const char *sz) wxBasicString::wxBasicString(const wxString& str) { #if wxUSE_UNICODE - m_wzBuf = new OLECHAR[str.Length() + 1]; - memcpy(m_wzBuf, str.c_str(), str.Length()*2); - m_wzBuf[str.Length()] = L'\0'; + m_wzBuf = new OLECHAR[str.length() + 1]; + memcpy(m_wzBuf, str.c_str(), str.length()*2); + m_wzBuf[str.length()] = L'\0'; #else Init(str.c_str()); #endif @@ -306,4 +305,3 @@ void wxLogRelease(const char *szInterface, ULONG cRef) #endif // wxUSE_OLE -