///////////////////////////////////////////////////////////////////////////////
-// Name: ole/oleutils.cpp
+// Name: src/msw/ole/oleutils.cpp
// Purpose: implementation of OLE helper functions
// Author: Vadim Zeitlin
// Modified by:
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#include "wx/setup.h"
-#include "wx/log.h"
-
#if wxUSE_OLE
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+#endif
+
#ifndef __CYGWIN10__
#include "wx/msw/private.h"
return false;
}
+WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str)
+{
+ return wxBasicString(str).Get();
+}
+
+WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
+{
+ // NULL BSTR is equivalent to an empty string (this is the convention used
+ // by VB and hence we must follow it)
+ if ( !bStr )
+ return wxString();
+
+ const int len = SysStringLen(bStr);
+
+#if wxUSE_UNICODE
+ wxString str(bStr, len);
+#else
+ wxString str;
+ if (len)
+ {
+ wxStringBufferLength buf(str, len); // asserts if len == 0
+ buf.SetLength(WideCharToMultiByte(CP_ACP, 0 /* no flags */,
+ bStr, len /* not necessarily NUL-terminated */,
+ buf, len,
+ NULL, NULL /* no default char */));
+ }
+#endif
+
+ return str;
+}
+
+// ----------------------------------------------------------------------------
+// wxBasicString
+// ----------------------------------------------------------------------------
+
+wxBasicString::wxBasicString(const wxString& str)
+{
+ m_bstrBuf = SysAllocString(str.wc_str(*wxConvCurrent));
+}
+
+wxBasicString::wxBasicString(const wxBasicString& src)
+{
+ m_bstrBuf = src.Get();
+}
+
+wxBasicString& wxBasicString::operator=(const wxBasicString& src)
+{
+ SysReAllocString(&m_bstrBuf, src);
+ return *this;
+}
+
+wxBasicString::~wxBasicString()
+{
+ SysFreeString(m_bstrBuf);
+}
+
#if wxUSE_DATAOBJ
// ----------------------------------------------------------------------------
// Debug support
// ----------------------------------------------------------------------------
-#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) )
+#if wxDEBUG_LEVEL && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) )
static wxString GetIidName(REFIID riid)
{
// an association between symbolic name and numeric value of an IID
};
// construct the table containing all known interfaces
- #define ADD_KNOWN_IID(name) { &IID_I##name, _T(#name) }
+ #define ADD_KNOWN_IID(name) { &IID_I##name, wxT(#name) }
static const KNOWN_IID aKnownIids[] = {
ADD_KNOWN_IID(AdviseSink),
wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
}
-#elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
-
-// For VC++ 4
-void wxLogQueryInterface(const char *szInterface, REFIID riid)
-{
- wxLogTrace("%s::QueryInterface", szInterface);
-}
-
-void wxLogAddRef(const char *szInterface, ULONG cRef)
-{
- wxLogTrace("After %s::AddRef: m_cRef = %d", szInterface, cRef + 1);
-}
-
-void wxLogRelease(const char *szInterface, ULONG cRef)
-{
- wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
-}
+#endif // wxDEBUG_LEVEL
-#endif // __WXDEBUG__
+#endif // wxUSE_DRAG_AND_DROP
-#endif
- // wxUSE_DRAG_AND_DROP
-
-#endif
- // __CYGWIN10__
-
-#endif
- // wxUSE_OLE
+#endif // __CYGWIN10__
+#endif // wxUSE_OLE