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
This commit is contained in:
@@ -542,7 +542,7 @@ void MyChild::OnPaste(wxCommandEvent& WXUNUSED(event))
|
|||||||
{
|
{
|
||||||
wxClipboardLocker lock;
|
wxClipboardLocker lock;
|
||||||
wxTextDataObject data;
|
wxTextDataObject data;
|
||||||
canvas->SetText(wxTheClipboard->GetData(data) ? data.GetText()
|
canvas->SetText(wxTheClipboard->GetData(data) ? data.GetText().c_str()
|
||||||
: _T("No text on clipboard"));
|
: _T("No text on clipboard"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user