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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 6e8b6ebb6da99c6165b305a3030404447b0b5f46..e789eb5d11d7c4bb1ee5b330c5258f19c7ba1d0e 100644 (file)
--- 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
     };
 
     // 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:
 
 #if wxUSE_CLIPBOARD
     // Convert selection to text:

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 24fc17ca09b14ebf20db993e530dca4469c82bfd..d5f6f34ce5b294cb37e1e6237b0d0246fb1bc5ac 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -918,7 +918,7 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
         {
             SelectLine(CalcUnscrolledPosition(event.GetPosition()));
 
         {
             SelectLine(CalcUnscrolledPosition(event.GetPosition()));
 

-            CopySelection();
+            (void) CopySelection();

         }
         else
         {
         }
         else
         {


@@ -1217,13 +1217,13 @@ void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
     if ( IsSelectionEnabled() &&
          event.GetKeyCode() == 'C' && event.ControlDown() )
     {
     if ( IsSelectionEnabled() &&
          event.GetKeyCode() == 'C' && event.ControlDown() )
     {

-        CopySelection();
+        (void) CopySelection();

     }
 }
 
 void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event))
 {

-    CopySelection();
+    (void) CopySelection();

 }
 
 void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
 }
 
 void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)


@@ -1233,7 +1233,7 @@ void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event)
     {
         SelectWord(CalcUnscrolledPosition(event.GetPosition()));
 
     {
         SelectWord(CalcUnscrolledPosition(event.GetPosition()));
 

-        CopySelection(Primary);
+        (void) CopySelection(Primary);

 
         m_lastDoubleClick = wxGetLocalTimeMillis();
     }
 
         m_lastDoubleClick = wxGetLocalTimeMillis();
     }