Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to make wxClipboard::Flush() test in sample actually useful

Browse Source 
Calling Flush() before putting anything on the clipboard didn't make
much sense.

See https://github.com/wxWidgets/wxWidgets/pull/1316
This commit is contained in:
Vadim Zeitlin
2019-05-10 01:53:52 +02:00
parent 28a84486bd
commit f60dc84534
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
samples/clipboard/clipboard.cpp
View File

@@ -143,10 +143,28 @@ MyFrame::MyFrame(const wxString& title)
void MyFrame::OnFlush(wxCommandEvent &WXUNUSED(event)) void MyFrame::OnFlush(wxCommandEvent &WXUNUSED(event))
{ {
if ( wxTheClipboard->Flush() ) wxClipboardLocker clipLock;
m_textctrl->SetValue( "Clipboard flushed successfully!!\n" );
else if ( !clipLock )
m_textctrl->SetValue( "Flushing clipboard failed!!\n" ); {
m_textctrl->AppendText("Failed to lock clipboard.\n");
return;
}
if ( !wxTheClipboard->AddData(new wxTextDataObject("Text from wx clipboard sample")) )
{
m_textctrl->AppendText("Failed to put text on clipboard.\n");
return;
}
if ( !wxTheClipboard->Flush() )
{
m_textctrl->AppendText("Failed to flush clipboard.\n");
return;
}
m_textctrl->AppendText("Clipboard flushed successfully, you should now "
"be able to paste text even after closing the sample.");
} }
void MyFrame::OnWriteClipboardContents(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnWriteClipboardContents(wxCommandEvent& WXUNUSED(event))