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

compilation fix for wxUSE_INTL == 0 (patch 646466)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-06 21:23:36 +00:00
parent 815b393a5a
commit adb45366da
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/strconv.cpp
View File

@@ -1018,8 +1018,11 @@ void wxCSConv::SetName(const wxChar *charset)
void wxCSConv::LoadNow() 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 ) if ( !m_name )
{ {
wxString name = wxLocale::GetSystemEncodingName(); wxString name = wxLocale::GetSystemEncodingName();
@@ -1028,6 +1031,7 @@ void wxCSConv::LoadNow()
SetName(name); SetName(name);
} }
} }
#endif // wxUSE_INTL
// wxGetCharacterSet() complains about NULL name // wxGetCharacterSet() complains about NULL name
m_cset = m_name ? wxGetCharacterSet(m_name) : NULL; m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;