Use same type in both results of A?B:C operator (Tinderbox build fix).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index ea50399a218fb7e85e65574681f85eb404df4fc2..dc6105a5060c0c8885f731e1ce9f580b8f3f57b0 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -542,7 +542,7 @@ void MyChild::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     wxClipboardLocker lock;
     wxTextDataObject data;
-    canvas->SetText(wxTheClipboard->GetData(data) ? data.GetText()
+    canvas->SetText(wxTheClipboard->GetData(data) ? data.GetText().c_str()
                                                   : _T("No text on clipboard"));
 }