From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 5 May 2013 00:07:05 +0000 (+0000)
Subject: Correct misleading error message in locale mismatch assert.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/49211791f946d63fa9de33ac8fac1787786307d3

Correct misleading error message in locale mismatch assert.

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
---

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 5d7cb3e38d..ee790a5c07 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -1444,10 +1444,10 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
         // this were not the case.
         wxASSERT_MSG( strcmp(setlocale(LC_ALL, NULL), "C") == 0,
                       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("Things are going to break, use wxSetLocale() to ")
-                      wxS("avoid this!") );
+                      wxS("Things are going to break, please only change ")
+                      wxS("locale by creating wxLocale objects to avoid this!") );
 
 
         // Return the hard coded values for C locale. This is really the right