Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded calls to c_str()

Browse Source
This commit is contained in:
Artur Wieczorek
2018-11-10 20:44:53 +01:00
parent 322d6874c3
commit e2115d0d6f
7 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/propgrid/props.cpp
View File

@@ -385,14 +385,14 @@ bool NumericValidation( const wxPGProperty* property,
if ( !maxOk )
msg = wxString::Format(
_("Value must be %s or higher."),
smin.c_str());
smin);
else
{
wxVariant vmax = WXVARIANT(max);
wxString smax = property->ValueToString(vmax);
msg = wxString::Format(
_("Value must be between %s and %s."),
smin.c_str(), smax.c_str());
smin, smax);
}
pValidationInfo->SetFailureMessage(msg);
}
@@ -416,14 +416,14 @@ bool NumericValidation( const wxPGProperty* property,
if ( !minOk )
msg = wxString::Format(
_("Value must be %s or less."),
smax.c_str());
smax);
else
{
wxVariant vmin = WXVARIANT(min);
wxString smin = property->ValueToString(vmin);
msg = wxString::Format(
_("Value must be between %s and %s."),
smin.c_str(), smax.c_str());
smin, smax);
}
pValidationInfo->SetFailureMessage(msg);
}
@@ -499,14 +499,14 @@ bool NumericValidation( const wxPGProperty* property,
if ( !maxOk )
msg = wxString::Format(
_("Value must be %s or higher."),
smin.c_str());
smin);
else
{
wxVariant vmax = WXVARIANT(max);
wxString smax = property->ValueToString(vmax);
msg = wxString::Format(
_("Value must be between %s and %s."),
smin.c_str(), smax.c_str());
smin, smax);
}
pValidationInfo->SetFailureMessage(msg);
}
@@ -530,14 +530,14 @@ bool NumericValidation( const wxPGProperty* property,
if ( !minOk )
msg = wxString::Format(
_("Value must be %s or less."),
smax.c_str());
smax);
else
{
wxVariant vmin = WXVARIANT(min);
wxString smin = property->ValueToString(vmin);
msg = wxString::Format(
_("Value must be between %s and %s."),
smin.c_str(), smax.c_str());
smin, smax);
}
pValidationInfo->SetFailureMessage(msg);
}
@@ -923,7 +923,7 @@ const wxString& wxPropertyGrid::DoubleToString(wxString& target,
*precTemplate << wxS('f');
}
target.Printf( precTemplate->c_str(), value );
target.Printf( *precTemplate, value );
}
else
{
@@ -1131,7 +1131,7 @@ wxString wxBoolProperty::ValueToString( wxVariant& value,
else
notFmt = wxS("Not %s");
return wxString::Format(notFmt.c_str(), m_label.c_str());
return wxString::Format(notFmt, m_label);
}
}