Some BC++ 4.5 and other compile fixes; changed FAR definition to WXFAR

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-06 11:48:14 +00:00
parent 0bd62129f6
commit 790ad94f70
9 changed files with 34 additions and 12 deletions
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -462,7 +462,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                    case CF_OEMTEXT:
                        size = strlen((const char *)pBuf);
                        break;
-#ifndef __WATCOMC__
+#if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                    case CF_UNICODETEXT:
                        size = wcslen((const wchar_t *)pBuf);
                        break;