correct access for virtual

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index ce53368f7af42b805c3620f3c7b19a74f40908ef..058f4afd87c658eec6f6fcf638996dbe0867c858 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:


@@ -17,22 +17,19 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "oleutils.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 // For compilers that support precompilation, includes "wx.h".
 #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"


@@ -71,6 +68,83 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
   return false;
 }
 
   return false;
 }
 

+WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str)
+{
+/*
+    unsigned int len = strlen((const char*) str);
+    unsigned short* s = new unsigned short[len*2+2];
+    unsigned int i;
+    memset(s, 0, len*2+2);
+    for (i=0; i < len; i++)
+        s[i*2] = str[i];
+*/
+    wxBasicString bstr(str.mb_str());
+    return bstr.Get();
+}
+
+WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
+{
+#if wxUSE_UNICODE
+    wxString str(bStr);
+#else
+    int len = SysStringLen(bStr) + 1;
+    char    *buf = new char[len];
+    (void)wcstombs( buf, bStr, len);
+    wxString str(buf);
+    delete[] buf;
+#endif
+    return str;
+}
+
+// ----------------------------------------------------------------------------
+// wxBasicString
+// ----------------------------------------------------------------------------
+
+// ctor takes an ANSI string and transforms it to Unicode
+wxBasicString::wxBasicString(const char *sz)
+{
+    Init(sz);
+}
+
+// ctor takes an ANSI or Unicode string and transforms it to Unicode
+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';
+#else
+    Init(str.c_str());
+#endif
+}
+
+// Takes an ANSI string and transforms it to Unicode
+void wxBasicString::Init(const char *sz)
+{
+    // get the size of required buffer
+    UINT lenAnsi = strlen(sz);
+#ifdef __MWERKS__
+    UINT lenWide = lenAnsi * 2 ;
+#else
+    UINT lenWide = mbstowcs(NULL, sz, lenAnsi);
+#endif
+
+    if ( lenWide > 0 ) {
+        m_wzBuf = new OLECHAR[lenWide + 1];
+        mbstowcs(m_wzBuf, sz, lenAnsi);
+        m_wzBuf[lenWide] = L'\0';
+    }
+    else {
+        m_wzBuf = NULL;
+    }
+}
+
+// dtor frees memory
+wxBasicString::~wxBasicString()
+{
+  delete [] m_wzBuf;
+}
+

 #if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------
 #if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------


@@ -223,7 +297,7 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
   wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
 }
 
   wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
 }
 

-#endif  //WXDEBUG
+#endif  // __WXDEBUG__

 
 #endif
   // wxUSE_DRAG_AND_DROP
 
 #endif
   // wxUSE_DRAG_AND_DROP


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

-