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
2006-07-25 06:48:03 +00:00
parent b2c82287f6
commit 37f66b047e
1 changed files with 1 additions and 1 deletions
--- 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"));
 }