From ef6cef09d4d4b70afcc6488ee4010bc55f72344a Mon Sep 17 00:00:00 2001
From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Sat, 9 May 2009 12:32:26 +0000
Subject: [PATCH] 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
---
 src/common/strconv.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 7c47d0c394..41ca712cdf 100644
--- 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
 
-- 
2.45.2