From: Jaakko Salli Date: Sat, 13 Sep 2008 19:35:52 +0000 (+0000) Subject: Needed to convert string variable's type from wxChar* to wxString because result... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/18b5bcb0671426aec35238e18fdb2b0e54e5de25 Needed to convert string variable's type from wxChar* to wxString because result of wxGetTranslation was assigned to it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index 69b21d2580..20812ce956 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -740,13 +740,13 @@ wxString wxBoolProperty::GetValueAsString( int argFlags ) const if ( argFlags & wxPG_UNEDITABLE_COMPOSITE_FRAGMENT ) return wxEmptyString; - const wxChar* notFmt; + wxString notFmt; if ( wxPGGlobalVars->m_autoGetTranslation ) notFmt = _("Not %s"); else - notFmt = wxT("Not %s"); + notFmt = wxS("Not %s"); - return wxString::Format(notFmt,m_label.c_str()); + return wxString::Format(notFmt.c_str(), m_label.c_str()); } }