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
This commit is contained in:
parent
3202d00dc9
commit
5de65c6930
@ -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:
|
||||
|
@ -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();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user