From 5de65c69302144824356ad94a659ffa539cf4139 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Wed, 26 Nov 2003 19:57:34 +0000 Subject: [PATCH] Declaration of CopySelection is bool instead of void. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/html/htmlwin.h | 2 +- src/html/htmlwin.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h index 6e8b6ebb6d..e789eb5d11 100644 --- a/include/wx/html/htmlwin.h +++ b/include/wx/html/htmlwin.h @@ -237,7 +237,7 @@ protected: }; // Copies selection to clipboard if the clipboard support is available - void CopySelection(ClipboardType t = Secondary); + bool CopySelection(ClipboardType t = Secondary); #if wxUSE_CLIPBOARD // Convert selection to text: diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 24fc17ca09..d5f6f34ce5 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -918,7 +918,7 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) { SelectLine(CalcUnscrolledPosition(event.GetPosition())); - CopySelection(); + (void) CopySelection(); } else { @@ -1217,13 +1217,13 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event) if ( IsSelectionEnabled() && event.GetKeyCode() == 'C' && event.ControlDown() ) { - CopySelection(); + (void) CopySelection(); } } void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event)) { - CopySelection(); + (void) CopySelection(); } void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event) @@ -1233,7 +1233,7 @@ void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event) { SelectWord(CalcUnscrolledPosition(event.GetPosition())); - CopySelection(Primary); + (void) CopySelection(Primary); m_lastDoubleClick = wxGetLocalTimeMillis(); } -- 2.45.2