Fix MinGW GCC 3.2/Unicode compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17997 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)
|
||||||
@@ -720,7 +720,7 @@ bool wxLocale::Init(int language, int flags)
|
|||||||
SORT_DEFAULT);
|
SORT_DEFAULT);
|
||||||
if (SetThreadLocale(lcid))
|
if (SetThreadLocale(lcid))
|
||||||
{
|
{
|
||||||
wxMB2WXbuf tmp = wxSetlocale(LC_ALL, wxEmptyString);
|
wxMB2WXbuf tmp(wxSetlocale(LC_ALL, wxEmptyString));
|
||||||
retloc = tmp;
|
retloc = tmp;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -745,7 +745,7 @@ bool wxLocale::Init(int language, int flags)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxMB2WXbuf tmp = wxSetlocale(LC_ALL, locale);
|
wxMB2WXbuf tmp(wxSetlocale(LC_ALL, locale));
|
||||||
retloc = tmp;
|
retloc = tmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -753,7 +753,7 @@ bool wxLocale::Init(int language, int flags)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxMB2WXbuf tmp = wxSetlocale(LC_ALL, wxEmptyString);
|
wxMB2WXbuf tmp(wxSetlocale(LC_ALL, wxEmptyString));
|
||||||
retloc = tmp;
|
retloc = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user