Eliminated WX_PG_DECLARE/IMPLEMENT_DERIVED_PROPERTY_CLASS

[wxWidgets.git] / src / msw / ole / oleutils.cpp

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 6a026d1d031e608c4cf6bfa4c3a1db245e6eeb12..59f387426c88a9f981723a2f2d61246220d0b669 100644 (file)
--- 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:
 // Purpose:     implementation of OLE helper functions
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -21,14 +21,15 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include  "wx/setup.h"
-#include  "wx/log.h"
-

 #if wxUSE_OLE
 
 #if wxUSE_OLE
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

 #ifndef __CYGWIN10__
 
 #include "wx/msw/private.h"
 #ifndef __CYGWIN10__
 
 #include "wx/msw/private.h"


@@ -67,6 +68,61 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
   return false;
 }
 
   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 ( !::WideCharToMultiByte(CP_ACP, 0 /* no flags */,
+                                bStr, len /* not necessary NUL-terminated */,
+                                wxStringBuffer(str, len + 1), len + 1,
+                                NULL, NULL /* no default char */) )
+    {
+        str.clear();
+    }
+#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
 
 // ----------------------------------------------------------------------------
 #if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------


@@ -229,4 +285,3 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
 
 #endif
   // wxUSE_OLE
 
 #endif
   // wxUSE_OLE

-