build fix for gcc4.3.3 (different types for arguments of ?: operator)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-09 12:32:26 +00:00 · 2009-05-09 12:32:26 +00:00 · ef6cef09d4
commit ef6cef09d4
parent 9fb0eb4679
1 changed files with 1 additions and 1 deletions
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@ -3149,7 +3149,7 @@ wxMBConv *wxCSConv::DoCreate() const

    wxLogTrace(TRACE_STRCONV,
               wxT("encoding \"%s\" is not supported by this system"),
-               (m_name ? m_name
+               (m_name ? wxString(m_name)
                       : wxFontMapperBase::GetEncodingName(m_encoding)));
 #endif // wxUSE_FONTMAP