Fixed compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -706,7 +706,7 @@ bool wxLocale::Init(int language, int flags)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
#elif defined(__WIN32__)
|
#elif defined(__WIN32__)
|
||||||
wxMB2WXbuf retloc(wxT("C"));
|
wxMB2WXbuf retloc = wxT("C");
|
||||||
if (language != wxLANGUAGE_DEFAULT)
|
if (language != wxLANGUAGE_DEFAULT)
|
||||||
{
|
{
|
||||||
if (info->WinLang == 0)
|
if (info->WinLang == 0)
|
||||||
@@ -1256,7 +1256,7 @@ wxString wxLocale::GetSystemEncodingName()
|
|||||||
char *alang = nl_langinfo(CODESET);
|
char *alang = nl_langinfo(CODESET);
|
||||||
setlocale(LC_CTYPE, oldLocale);
|
setlocale(LC_CTYPE, oldLocale);
|
||||||
free(oldLocale);
|
free(oldLocale);
|
||||||
|
|
||||||
if ( alang )
|
if ( alang )
|
||||||
{
|
{
|
||||||
// 7 bit ASCII encoding has several alternative names which we should
|
// 7 bit ASCII encoding has several alternative names which we should
|
||||||
|
Reference in New Issue
Block a user