Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary wxMac check from Unix code not used under Mac

Browse Source 
This file is not compiled under Mac, where src/osx/core/uilocale.mm is
used, so there is no need to check for __WXMAC__ here.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-09-05 00:26:07 +02:00
parent 6b26deaddc
commit 6f4dd01b5b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/unix/uilocale.cpp
View File

@@ -184,10 +184,8 @@ static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)
const char *l = NULL; const char *l = NULL;
// NB: We prefer to set UTF-8 locale if it's possible and only fall back to // NB: We prefer to set UTF-8 locale if it's possible and only fall back to
// non-UTF-8 locale if it fails, but this is not necessary under the // non-UTF-8 locale if it fails.
// supported macOS versions where xx_YY locales are just aliases to #if wxUSE_UNICODE
// xx_YY.UTF-8 anyhow.
#if wxUSE_UNICODE && !defined(__WXMAC__)
if ( !lc.empty() ) if ( !lc.empty() )
{ {
wxString buf(lc); wxString buf(lc);
@@ -213,7 +211,7 @@ static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)
// if we can't set UTF-8 locale, try non-UTF-8 one: // if we can't set UTF-8 locale, try non-UTF-8 one:
if ( !l ) if ( !l )
#endif // wxUSE_UNICODE && !__WXMAC__ #endif // wxUSE_UNICODE
l = wxSetlocale(c, lc); l = wxSetlocale(c, lc);
return l; return l;