include stdlib.h to get malloc/free decl

[wxWidgets.git] / include / wx / html / htmlwin.h

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 101e6fa93871e111c6bb072aab097b203058b306..c62febbf6db545eab7dc62711aef4c9a647972e9 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -162,9 +162,6 @@ public:
     // Adds HTML processor to wxHtmlWindow class as whole:
     static void AddGlobalProcessor(wxHtmlProcessor *processor);
 
     // Adds HTML processor to wxHtmlWindow class as whole:
     static void AddGlobalProcessor(wxHtmlProcessor *processor);
 

-    // what would we do with it?
-    virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
-

     // -- Callbacks --
 
     // Sets the title of the window
     // -- Callbacks --
 
     // Sets the title of the window


@@ -193,6 +190,13 @@ public:
                                              const wxString& WXUNUSED(url),
                                              wxString *WXUNUSED(redirect)) const
         { return wxHTML_OPEN; }
                                              const wxString& WXUNUSED(url),
                                              wxString *WXUNUSED(redirect)) const
         { return wxHTML_OPEN; }

+   
+#if wxUSE_CLIPBOARD
+    // Helper functions to select parts of page:
+    void SelectWord(const wxPoint& pos);
+    void SelectLine(const wxPoint& pos);
+    void SelectAll();
+#endif

 
 protected:
     void Init();
 
 protected:
     void Init();


@@ -240,16 +244,14 @@ 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);
+    //
+    // returns true if anything was copied to clipboard, false otherwise
+    bool CopySelection(ClipboardType t = Secondary);

 
 #if wxUSE_CLIPBOARD
     // Convert selection to text:
     wxString SelectionToText();
 
 
 #if wxUSE_CLIPBOARD
     // Convert selection to text:
     wxString SelectionToText();
 

-    // Helper functions to select parts of page:
-    void SelectWord(const wxPoint& pos);
-    void SelectLine(const wxPoint& pos);
-

     // Automatic scrolling during selection:
     void StopAutoScrolling();
 #endif // wxUSE_CLIPBOARD
     // Automatic scrolling during selection:
     void StopAutoScrolling();
 #endif // wxUSE_CLIPBOARD