Remove unnecessary c_str() calls from the samples
Pass wxStrings directly to wxString::Format("%s") and similar pseudo-vararg functions, there is no need for c_str() there since wxWidgets 2.9. Closes https://github.com/wxWidgets/wxWidgets/pull/1009
This commit is contained in:
committed by
Vadim Zeitlin
parent
63c602c3d2
commit
65827a0572
@@ -348,7 +348,7 @@ void MyFrame::CreateBox()
|
||||
"Item</font> <b>%lu</b>"
|
||||
"</h%d>",
|
||||
level,
|
||||
clr.GetAsString(wxC2S_HTML_SYNTAX).c_str(),
|
||||
clr.GetAsString(wxC2S_HTML_SYNTAX),
|
||||
(unsigned long)n, level);
|
||||
arr.Add(label);
|
||||
}
|
||||
@@ -489,7 +489,7 @@ void MyFrame::OnClear(wxCommandEvent& WXUNUSED(event))
|
||||
|
||||
void MyFrame::OnHtmlLinkClicked(wxHtmlLinkEvent &event)
|
||||
{
|
||||
wxLogMessage("The url '%s' has been clicked!", event.GetLinkInfo().GetHref().c_str());
|
||||
wxLogMessage("The url '%s' has been clicked!", event.GetLinkInfo().GetHref());
|
||||
|
||||
if (GetMyBox())
|
||||
{
|
||||
@@ -541,7 +541,7 @@ void MyFrame::OnLboxSelect(wxCommandEvent& event)
|
||||
|
||||
if ( !s.empty() )
|
||||
{
|
||||
wxLogMessage("Selected items: %s", s.c_str());
|
||||
wxLogMessage("Selected items: %s", s);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -621,7 +621,7 @@ wxString MyHtmlListBox::OnGetItem(size_t n) const
|
||||
"Item</font> <b>%lu</b>"
|
||||
"</h%d>",
|
||||
level,
|
||||
clr.GetAsString(wxC2S_HTML_SYNTAX).c_str(),
|
||||
clr.GetAsString(wxC2S_HTML_SYNTAX),
|
||||
(unsigned long)n, level);
|
||||
if ( n == 1 )
|
||||
{
|
||||
|
Reference in New Issue
Block a user