removed wxGzipStreams (supported by wxZlibStreams now)

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index da2e97d2005570f84bea2b375798b8554fb37d32..0e4fab1eda97aa8fec7529651b13750103dab191 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLWIN_H_
 #define _WX_HTMLWIN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "htmlwin.h"
 #endif
 
@@ -21,7 +21,6 @@
 #include "wx/window.h"
 #include "wx/scrolwin.h"
 #include "wx/config.h"
-#include "wx/treectrl.h"
 #include "wx/html/winpars.h"
 #include "wx/html/htmlcell.h"
 #include "wx/filesys.h"
@@ -32,7 +31,7 @@ class wxHtmlProcessor;
 class wxHtmlWinModule;
 class wxHtmlHistoryArray;
 class wxHtmlProcessorList;
-class WXDLLEXPORT wxHtmlWinAutoScrollTimer;
+class WXDLLIMPEXP_HTML wxHtmlWinAutoScrollTimer;
 
 
 // wxHtmlWindow flags:
@@ -62,7 +61,7 @@ enum wxHtmlOpeningStatus
 //                  SetPage(text) or LoadPage(filename).
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
+class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
     friend class wxHtmlWinModule;
@@ -163,9 +162,6 @@ public:
     // 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
@@ -194,7 +190,17 @@ public:
                                              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
 
+    virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
+        { /* do nothing */ }
+    
 protected:
     void Init();
 
@@ -214,7 +220,6 @@ protected:
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseDown(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);
-    void OnIdle(wxIdleEvent& event);
 #if wxUSE_CLIPBOARD
     void OnKeyUp(wxKeyEvent& event);
     void OnDoubleClick(wxMouseEvent& event);
@@ -223,6 +228,8 @@ protected:
     void OnMouseLeave(wxMouseEvent& event);
 #endif // wxUSE_CLIPBOARD
 
+    virtual void OnInternalIdle();
+
     // Returns new filter (will be stored into m_DefaultFilter variable)
     virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
 
@@ -240,16 +247,14 @@ protected:
     };
 
     // 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();
 
-    // 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