Helps Borland compile further in Unicode mode.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/intl.h b/include/wx/intl.h
index d7fb1637eee20dc86f437b0fbe08931ae96a2619..e18303f019b6a8978ebc19a4433ff176711924b7 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -131,7 +131,10 @@ extern WXDLLEXPORT wxLocale* wxGetLocale();
 inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
 {
     wxLocale *pLoc = wxGetLocale();
 inline const wxMB2WXbuf wxGetTranslation(const wxChar *sz)
 {
     wxLocale *pLoc = wxGetLocale();

-    return pLoc ? pLoc->GetString(sz) : (const wxMB2WXbuf)sz;
+    if (pLoc)
+        return pLoc->GetString(sz);
+    else
+        return (const wxMB2WXbuf)sz;

 }
 
 #endif
 }
 
 #endif

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 92556cea5dd0758e4ef757d6a7fc8745f32a1246..4ff34b9e9fdaf59e452904526e3282dc102d468b 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -454,6 +454,7 @@ size_t   WXDLLEXPORT wcslen(const wchar_t *s);
 #endif
 
 #ifdef wxNEED_WX_STRING_H
 #endif
 
 #ifdef wxNEED_WX_STRING_H

+int      WXDLLEXPORT wxStrcmp(const wxChar *psz1, const wxChar *psz2);

 size_t   WXDLLEXPORT wxStrlen(const wxChar *s);
 #endif
 
 size_t   WXDLLEXPORT wxStrlen(const wxChar *s);
 #endif