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

compilation fix for !wxUSE_FONTMAPstrconv.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-07-31 12:22:33 +00:00
parent 72f8c79220
commit 91cb7f52cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/strconv.cpp
View File

@@ -1668,7 +1668,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC); const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
#else // !wxUSE_FONTMAP #else // !wxUSE_FONTMAP
static const wxChar *names[] = static const wxChar *names_static[] =
{ {
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
_T("UCS-4"), _T("UCS-4"),
@@ -1677,6 +1677,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
#endif #endif
NULL NULL
}; };
const wxChar **names = names_static;
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
for ( ; *names && ms_wcCharsetName.empty(); ++names ) for ( ; *names && ms_wcCharsetName.empty(); ++names )