Fixing font utilities

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 3f6aab815c4de02f8f5ae0feb497ccd1d5a2c728..22466f4856e0bdc94cd78afe771587a39feb1824 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -49,19 +49,32 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
     friend class wxHtmlWinModule;
 
 public:
-    wxHtmlWindow() : wxScrolledWindow() {};
+    wxHtmlWindow() { Init(); }
     wxHtmlWindow(wxWindow *parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHW_SCROLLBAR_AUTO,
-                 const wxString& name = "htmlWindow");
+                 const wxString& name = wxT("htmlWindow"))
+    {
+        Init();
+        Create(parent, id, pos, size, style, name);
+    }
     ~wxHtmlWindow();
 
+    bool Create(wxWindow *parent, wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxHW_SCROLLBAR_AUTO,
+                const wxString& name = wxT("htmlWindow"));
+
     // Set HTML page and display it. !! source is HTML document itself,
     // it is NOT address/filename of HTML document. If you want to
     // specify document location, use LoadPage() istead
     // Return value : FALSE if an error occured, TRUE otherwise
     bool SetPage(const wxString& source);
+    
+    // Append to current page
+    bool AppendToPage(const wxString& source);
 
     // Load HTML page from given location. Location can be either
     // a) /usr/wxGTK2/docs/html/wx.htm
@@ -137,6 +150,11 @@ public:
     // Called when user clicked on hypertext link. Default behavior is to
     // call LoadPage(loc)
     virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
+    
+    // Called when wxHtmlWindow wants to fetch data from an URL (e.g. when loading
+    // a page or loading an image). The data are downloaded if and only if 
+    // OnOpeningURL returns TRUE.
+    virtual bool OnOpeningURL(const wxString& url) const { return TRUE; }
 
     // Returns a pointer to the parser.
     wxHtmlWinParser *GetParser() const { return m_Parser; }
@@ -150,6 +168,8 @@ public:
     virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
 
 protected:
+    void Init();
+
     // Scrolls to anchor of this name. (Anchor is #news
     // or #features etc. it is part of address sometimes:
     // http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/index.html#news)
@@ -237,3 +257,4 @@ private:
 #endif
 
 #endif // _WX_HTMLWIN_H_
+