compilation fix for wxUSE_INTL == 0 (patch 646466)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1018,8 +1018,11 @@ void wxCSConv::SetName(const wxChar *charset)
|
||||
|
||||
void wxCSConv::LoadNow()
|
||||
{
|
||||
if (m_deferred)
|
||||
if ( m_deferred )
|
||||
{
|
||||
// it would probably be better to make GetSystemEncodingName() always
|
||||
// available (i.e. even when wxUSE_INTL == 0)?
|
||||
#if wxUSE_INTL
|
||||
if ( !m_name )
|
||||
{
|
||||
wxString name = wxLocale::GetSystemEncodingName();
|
||||
@@ -1028,6 +1031,7 @@ void wxCSConv::LoadNow()
|
||||
SetName(name);
|
||||
}
|
||||
}
|
||||
#endif // wxUSE_INTL
|
||||
|
||||
// wxGetCharacterSet() complains about NULL name
|
||||
m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
|
||||
|
Reference in New Issue
Block a user