Fix wxGrid compilation with MSVC7.

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 8fbcf998855b1d38a7e678c6fb72290a24187300..cd7dd75edcac53f2c223750c35b75deb522d97c6 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -80,15 +80,22 @@ WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
     if ( !bStr )
         return wxString();
 
     if ( !bStr )
         return wxString();
 

+    const int len = SysStringLen(bStr);
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxString str(bStr);
+    wxString str(bStr, len);

 #else
 #else

-    int len = SysStringLen(bStr) + 1;
-    char    *buf = new char[len];
-    (void)wcstombs( buf, bStr, len);
-    wxString str(buf);
-    delete[] buf;
+    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
 #endif

+

     return str;
 }
 
     return str;
 }
 


@@ -123,7 +130,7 @@ wxBasicString::~wxBasicString()
 // Debug support
 // ----------------------------------------------------------------------------
 
 // 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
 static wxString GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID


@@ -133,7 +140,7 @@ static wxString GetIidName(REFIID riid)
   };
 
   // construct the table containing all known interfaces
   };
 
   // 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),
 
   static const KNOWN_IID aKnownIids[] = {
     ADD_KNOWN_IID(AdviseSink),


@@ -251,31 +258,10 @@ void wxLogRelease(const wxChar *szInterface, ULONG cRef)
   wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
 }
 
   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__
+#endif  // wxDEBUG_LEVEL

 
 

-#endif
-  // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DRAG_AND_DROP

 
 

-#endif
-  // __CYGWIN10__
+#endif // __CYGWIN10__

 
 

-#endif
-  // wxUSE_OLE
+#endif // wxUSE_OLE