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

compilation fix: setlocale() returns non-const string pointer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-23 21:25:26 +00:00
parent cb352236d9
commit db2a7aabf9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/wxcrt.h
View File

@@ -791,7 +791,7 @@ WXDLLIMPEXP_BASE wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **sa
WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale_(int category, const wxChar *locale); WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale_(int category, const wxChar *locale);
WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale); WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
#else #else
WXDLLIMPEXP_BASE const wxChar *wxSetlocale(int category, const wxChar *locale); WXDLLIMPEXP_BASE wxChar *wxSetlocale(int category, const wxChar *locale);
#endif // defined(wxSetlocale_) #endif // defined(wxSetlocale_)
#endif // __cplusplus #endif // __cplusplus

4
src/common/wxcrt.cpp
View File

@@ -820,9 +820,9 @@ wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
return rv; return rv;
} }
#else // defined(wxSetlocale_) #else // defined(wxSetlocale_)
const wxChar *wxSetlocale(int category, const wxChar *locale) wxChar *wxSetlocale(int category, const wxChar *locale)
{ {
const wxChar *rv = wxSetlocale_(category, locale); wxChar *rv = wxSetlocale_(category, locale);
if ( rv ) if ( rv )
wxUpdateLocaleIsUtf8(); wxUpdateLocaleIsUtf8();
return rv; return rv;