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

warnings fixes for !wxUSE_FONTMAP

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

4
src/common/strconv.cpp
View File

@@ -3306,7 +3306,9 @@ wxMBConv *wxCSConv::DoCreate() const
#endif // !wxUSE_FONTMAP #endif // !wxUSE_FONTMAP
{ {
wxString name(m_name); wxString name(m_name);
#if wxUSE_FONTMAP
wxFontEncoding encoding(m_encoding); wxFontEncoding encoding(m_encoding);
#endif
if ( !name.empty() ) if ( !name.empty() )
{ {
@@ -3475,7 +3477,7 @@ wxMBConv *wxCSConv::DoCreate() const
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
wxFontMapperBase::GetEncodingDescription(m_encoding).c_str() wxFontMapperBase::GetEncodingDescription(m_encoding).c_str()
#else // !wxUSE_FONTMAP #else // !wxUSE_FONTMAP
wxString::Format(_("encoding %s"), m_encoding).c_str() wxString::Format(_("encoding %i"), m_encoding).c_str()
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
); );