From 37f66b047e6c7e19f081d026f0a8b77ef54495d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 25 Jul 2006 06:48:03 +0000 Subject: [PATCH] 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 --- samples/mdi/mdi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index ea50399a21..dc6105a506 100644 --- 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")); } -- 2.47.2