From: Václav Slavík Date: Thu, 27 Dec 2001 18:07:04 +0000 (+0000) Subject: fix for Unicode build -- wxMB2WXbuf cannot be initialized with NULL X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9b7f3e3023c1885ec181169fe424b00fc0220270 fix for Unicode build -- wxMB2WXbuf cannot be initialized with NULL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/intl.cpp b/src/common/intl.cpp index f41c6ba9c5..83fac1f03b 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -1364,7 +1364,11 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString, const wxChar *szDomain) const { if ( wxIsEmpty(szOrigString) ) +#if wxUSE_UNICODE + return szDomain ? szDomain : wxT(""); +#else // ANSI return szDomain; +#endif const char *pszTrans = NULL; #if wxUSE_UNICODE