From 797a27067871dc8602c09ba417b8e795ed04856d Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Wed, 1 Apr 2009 15:20:42 +0000 Subject: [PATCH] fix a problem with setlocale() under Windows: with MSVC7 it sometimes returns garbage when passing "": use NULL instead (may need a fix also in wxLocale::IsAvailable) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/xlocale.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/xlocale.cpp b/src/common/xlocale.cpp index f66b2ab71a..0864e50c26 100644 --- a/src/common/xlocale.cpp +++ b/src/common/xlocale.cpp @@ -276,11 +276,14 @@ int wxToupper_l(const wxUniChar& c, const wxXLocale& loc) case !wxHAS_XLOCALE_SUPPORT... */ +/* + Note that this code is similar to (a portion of) wxLocale::IsAvailable code +*/ #define IMPLEMENT_STRTOX_L_START \ wxCHECK(loc.IsOk(), 0); \ \ /* (Try to) temporary set the locale to 'C' */ \ - const char *oldLocale = wxSetlocale(LC_NUMERIC, ""); \ + const char *oldLocale = wxSetlocale(LC_NUMERIC, NULL); \ const char *tmp = wxSetlocale(LC_NUMERIC, "C"); \ if ( !tmp ) \ { \ @@ -289,9 +292,7 @@ int wxToupper_l(const wxUniChar& c, const wxXLocale& loc) errno = EINVAL; \ /* signal an error (better than nothing) */ \ return 0; \ - } \ - \ - + } #define IMPLEMENT_STRTOX_L_END \ /* restore the original locale */ \ -- 2.49.0