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

Correct misleading error message in locale mismatch assert.

Browse Source 
Don't advise people to use non-existent (or at least not publicly accessible)
wxSetLocale(), they should just create wxLocale objects instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-05-05 00:07:05 +00:00
parent 233666915e
commit 49211791f9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/intl.cpp
View File

@@ -1444,10 +1444,10 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
// this were not the case. // this were not the case.
wxASSERT_MSG( strcmp(setlocale(LC_ALL, NULL), "C") == 0, wxASSERT_MSG( strcmp(setlocale(LC_ALL, NULL), "C") == 0,
wxS("You probably called setlocale() directly instead ") wxS("You probably called setlocale() directly instead ")
wxS("of calling wxSetLocale() and now there is a ") wxS("of using wxLocale and now there is a ")
wxS("mismatch between C/C++ and Windows locale.\n") wxS("mismatch between C/C++ and Windows locale.\n")
wxS("Things are going to break, use wxSetLocale() to ") wxS("Things are going to break, please only change ")
wxS("avoid this!") ); wxS("locale by creating wxLocale objects to avoid this!") );
// Return the hard coded values for C locale. This is really the right // Return the hard coded values for C locale. This is really the right