resolved conflict (because I forgot to commit before)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-26 20:01:54 +00:00
parent 5de65c6930
commit 4bdce112bf
1 changed files with 2 additions and 0 deletions
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -237,6 +237,8 @@ protected:
    };

    // Copies selection to clipboard if the clipboard support is available
+    //
+    // returns true if anything was copied to clipboard, false otherwise
    bool CopySelection(ClipboardType t = Secondary);

 #if wxUSE_CLIPBOARD