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

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

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index a1147cad0681ab2ee02a366908bd4f142d8c6549..a12d6f28b75773c769f16b3a71372abd4a166290 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -1193,7 +1193,7 @@ const wxChar *RegTreeCtrl::TreeNode::FullName() const
         s_strName = Parent()->FullName();
         s_strName << wxT('\\') << m_strName;
 
         s_strName = Parent()->FullName();
         s_strName << wxT('\\') << m_strName;
 

-        return s_strName;
+        return s_strName.t_str();

     }
 }
 
     }
 }
 

diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp
index 3e0a7fd7b56884ce383e43083b88c2c99bb32360..6fd518e2999ff2506145b1fe00122327d166d8df 100644 (file)
--- a/samples/uiaction/uiaction.cpp
+++ b/samples/uiaction/uiaction.cpp
@@ -213,7 +213,7 @@ void MyFrame::OnSimulateText(wxCommandEvent& WXUNUSED(event))
 
     wxUIActionSimulator sim;
     m_text->SetFocus();
 
     wxUIActionSimulator sim;
     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))

diff --git a/tests/benchmarks/htmlparser/htmlpars.cpp b/tests/benchmarks/htmlparser/htmlpars.cpp
index 3bc1dea94a7a5f97a1afedd9f6f53ab8ed6efe5e..7cb3b223621d49b088b259557a30a8c04d3c1c47 100644 (file)
--- a/tests/benchmarks/htmlparser/htmlpars.cpp
+++ b/tests/benchmarks/htmlparser/htmlpars.cpp
@@ -295,7 +295,7 @@ void wx28HtmlParser::DoParsing(int begin_pos, int end_pos)
             // Add text:
             AddText(GetEntitiesParser()->Parse(
                        m_Source.Mid(pieces[m_CurTextPiece].m_pos,
             // Add text:
             AddText(GetEntitiesParser()->Parse(
                        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 +
                         pieces[m_CurTextPiece].m_lng;
             m_CurTextPiece++;
             begin_pos = pieces[m_CurTextPiece].m_pos +
                         pieces[m_CurTextPiece].m_lng;
             m_CurTextPiece++;

diff --git a/tests/benchmarks/strings.cpp b/tests/benchmarks/strings.cpp
index b1ee26936d12bd3f87c7ec868b55cf227fe7468a..6ea1f53e8608bc120fe28d44132a41b89053e909 100644 (file)
--- a/tests/benchmarks/strings.cpp
+++ b/tests/benchmarks/strings.cpp
@@ -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)
 {
     const wxString& s = GetTestAsciiString();
 
 }
 
 BENCHMARK_FUNC(StrcmpW)
 {
     const wxString& s = GetTestAsciiString();
 

-    return wxCRT_StrcmpW(s, s) == 0;
+    return wxCRT_StrcmpW(s.wc_str(), s.wc_str()) == 0;

 }
 
 BENCHMARK_FUNC(StricmpA)
 {
     const wxString& s = GetTestAsciiString();
 
 }
 
 BENCHMARK_FUNC(StricmpA)
 {
     const wxString& s = GetTestAsciiString();
 

-    return wxCRT_StricmpA(s, s) == 0;
+    return wxCRT_StricmpA(s.c_str(), s.c_str()) == 0;

 }
 
 BENCHMARK_FUNC(StricmpW)
 {
     const wxString& s = GetTestAsciiString();
 
 }
 
 BENCHMARK_FUNC(StricmpW)
 {
     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)