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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 7c47d0c394aa462a675346f2674d5c6124c4a322..41ca712cdfac1fd7296f92230ff9e1ed95bd4283 100644 (file)
--- 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"),
 
     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
 
                        : wxFontMapperBase::GetEncodingName(m_encoding)));
 #endif // wxUSE_FONTMAP