From: Ove Kaaven Date: Mon, 19 Apr 1999 17:48:28 +0000 (+0000) Subject: Helps Borland compile further in Unicode mode. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/06c545a70377ea25f2263b2d2fa432db67d8b619 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 d7fb1637ee..e18303f019 100644 --- 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(); - return pLoc ? pLoc->GetString(sz) : (const wxMB2WXbuf)sz; + if (pLoc) + return pLoc->GetString(sz); + else + return (const wxMB2WXbuf)sz; } #endif diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 92556cea5d..4ff34b9e9f 100644 --- 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 +int WXDLLEXPORT wxStrcmp(const wxChar *psz1, const wxChar *psz2); size_t WXDLLEXPORT wxStrlen(const wxChar *s); #endif