X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2dd8d2d7f036074afd7db6632b3b5ec32c2f3900..fa5a0e70640118cc7f9fac0ccc95da7579c57bd1:/samples/controls/controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 8f50189633..236468c6cb 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1312,10 +1312,10 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 #if wxUSE_CHOICE
 
-static const wxChar *GetDataString(wxClientData *data)
+static wxString GetDataString(wxClientData *data)
 {
-    return data ? wx_static_cast(wxStringClientData *, data)->GetData().c_str()
-                : _T("none");
+    return data ? wx_static_cast(wxStringClientData *, data)->GetData()
+                : wxString("none");
 }
 
 void MyPanel::OnChoice( wxCommandEvent &event )
@@ -1333,8 +1333,8 @@ void MyPanel::OnChoice( wxCommandEvent &event )
                  _T("data \"%s\"/\"%s\""),
                  (int)event.GetInt(),
                  sel,
-                 event.GetString().c_str(),
-                 choice->GetStringSelection().c_str(),
+                 event.GetString(),
+                 choice->GetStringSelection(),
                  GetDataString(dataEvt),
                  GetDataString(dataCtrl));
 }
@@ -1945,7 +1945,7 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
             msg.Printf(
                     _T("Focus: %s")
 #ifdef __WXMSW__
-                    _T(", HWND = %08x"),
+                    , _T(", HWND = %08x")
 #endif
                     , s_windowFocus->GetName().c_str()
 #ifdef __WXMSW__