From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 22 Sep 2005 12:48:07 +0000 (+0000)
Subject: gcc compilation fixes after last commit
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/422e411e954e0232d9765665a7640f095ca3c9d5?ds=inline

gcc compilation fixes after last commit


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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index bb08007cf4..74e3a3be0b 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1341,7 +1341,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
     return result;
 }
 
-wxString wxMBConv_iconv::ms_wcCharsetName = NULL;
+wxString wxMBConv_iconv::ms_wcCharsetName;
 bool wxMBConv_iconv::ms_wcNeedsSwap = false;
 
 wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
@@ -1407,7 +1407,8 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
                     if (ICONV_FAILED(res, insz))
                     {
                         wxLogLastError(wxT("iconv"));
-                        wxLogError(_("Conversion to charset '%s' doesn't work."), name);
+                        wxLogError(_("Conversion to charset '%s' doesn't work."),
+                                   name.c_str());
                     }
                     else // ok, can convert to this encoding, remember it
                     {
@@ -1445,7 +1446,7 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
         {
             wxLogTrace(TRACE_STRCONV,
                        wxT("\"%s\" -> \"%s\" works but not the converse!?"),
-                       ms_wcCharsetName.c_str(), cname);
+                       ms_wcCharsetName.c_str(), cname.data());
         }
     }
 }