Add implicit conversion, remove conversion to bool

[wxWidgets.git] / samples / controls / controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 8f50189633c83aeb6d6c5389db0a98c75a43edaf..2ab570ed62eef23d3ab9317718ce054b94f6dc87 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1314,8 +1314,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 static const wxChar *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")
+    ).c_str();
 }
 
 void MyPanel::OnChoice( wxCommandEvent &event )
@@ -1945,7 +1946,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__