From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 31 Jul 2006 12:28:05 +0000 (+0000)
Subject: warnings fixes for !wxUSE_FONTMAP
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3ef10cfc2e5a4d5b37f8c14996b4da89ccad7f34

warnings fixes for !wxUSE_FONTMAP


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 06f7637db8..8936454dfe 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -3306,7 +3306,9 @@ wxMBConv *wxCSConv::DoCreate() const
 #endif // !wxUSE_FONTMAP
     {
         wxString name(m_name);
+#if wxUSE_FONTMAP
         wxFontEncoding encoding(m_encoding);
+#endif
 
         if ( !name.empty() )
         {
@@ -3475,7 +3477,7 @@ wxMBConv *wxCSConv::DoCreate() const
 #if wxUSE_FONTMAP
                          wxFontMapperBase::GetEncodingDescription(m_encoding).c_str()
 #else // !wxUSE_FONTMAP
-                         wxString::Format(_("encoding %s"), m_encoding).c_str()
+                         wxString::Format(_("encoding %i"), m_encoding).c_str()
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
               );