Some C++Builder fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-15 19:53:30 +00:00
parent 8dfea369ea
commit d834f22c8e
3 changed files with 12 additions and 0 deletions
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -476,7 +476,11 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                        break;
 #if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                    case CF_UNICODETEXT:
+#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
+                        size = std::wcslen((const wchar_t *)pBuf);
+#else
                        size = ::wcslen((const wchar_t *)pBuf);
+#endif
                        break;
 #endif
                    case CF_BITMAP: