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

Add missing c_str() and similar calls to samples in STL build.

Browse Source 
Don't rely on implicit conversion of wxString to char*/wxChar*, it doesn't
exist in STL build. Add explicit c_str(), wc_str() or t_str() calls.

Closes #14420.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-06-20 17:54:42 +00:00
parent 9597d39a2e
commit 7e3ea54f47
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/regtest/regtest.cpp
View File

@@ -1193,7 +1193,7 @@ const wxChar *RegTreeCtrl::TreeNode::FullName() const
s_strName = Parent()->FullName(); s_strName = Parent()->FullName();
s_strName << wxT('\\') << m_strName; s_strName << wxT('\\') << m_strName;
return s_strName; return s_strName.t_str();
} }
} }

2
samples/uiaction/uiaction.cpp
View File

@@ -213,7 +213,7 @@ void MyFrame::OnSimulateText(wxCommandEvent& WXUNUSED(event))
wxUIActionSimulator sim; wxUIActionSimulator sim;
m_text->SetFocus(); m_text->SetFocus();
sim.Text(s_text); sim.Text(s_text.c_str());
} }
void MyFrame::OnButtonPressed(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnButtonPressed(wxCommandEvent& WXUNUSED(event))

2
tests/benchmarks/htmlparser/htmlpars.cpp
View File

@@ -295,7 +295,7 @@ void wx28HtmlParser::DoParsing(int begin_pos, int end_pos)
// Add text: // Add text:
AddText(GetEntitiesParser()->Parse( AddText(GetEntitiesParser()->Parse(
m_Source.Mid(pieces[m_CurTextPiece].m_pos, m_Source.Mid(pieces[m_CurTextPiece].m_pos,
pieces[m_CurTextPiece].m_lng))); pieces[m_CurTextPiece].m_lng)).t_str());
begin_pos = pieces[m_CurTextPiece].m_pos + begin_pos = pieces[m_CurTextPiece].m_pos +
pieces[m_CurTextPiece].m_lng; pieces[m_CurTextPiece].m_lng;
m_CurTextPiece++; m_CurTextPiece++;

8
tests/benchmarks/strings.cpp
View File

@@ -315,28 +315,28 @@ BENCHMARK_FUNC(StrcmpA)
{ {
const wxString& s = GetTestAsciiString(); const wxString& s = GetTestAsciiString();
return wxCRT_StrcmpA(s, s) == 0; return wxCRT_StrcmpA(s.c_str(), s.c_str()) == 0;
} }
BENCHMARK_FUNC(StrcmpW) BENCHMARK_FUNC(StrcmpW)
{ {
const wxString& s = GetTestAsciiString(); const wxString& s = GetTestAsciiString();
return wxCRT_StrcmpW(s, s) == 0; return wxCRT_StrcmpW(s.wc_str(), s.wc_str()) == 0;
} }
BENCHMARK_FUNC(StricmpA) BENCHMARK_FUNC(StricmpA)
{ {
const wxString& s = GetTestAsciiString(); const wxString& s = GetTestAsciiString();
return wxCRT_StricmpA(s, s) == 0; return wxCRT_StricmpA(s.c_str(), s.c_str()) == 0;
} }
BENCHMARK_FUNC(StricmpW) BENCHMARK_FUNC(StricmpW)
{ {
const wxString& s = GetTestAsciiString(); const wxString& s = GetTestAsciiString();
return wxCRT_StricmpW(s, s) == 0; return wxCRT_StricmpW(s.wc_str(), s.wc_str()) == 0;
} }
BENCHMARK_FUNC(StringCmp) BENCHMARK_FUNC(StringCmp)