compilation fix for recent commit

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 2bf22cd0cc8d5563f165f9340c45208eea7b1280..c58d244feb3999d2e305fbe34cb271547adf522f 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:
     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,
     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();
 
     ~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);
     // 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
 
     // Load HTML page from given location. Location can be either
     // a) /usr/wxGTK2/docs/html/wx.htm


@@ -72,7 +85,7 @@ public:
     // After the page is loaded, the method calls SetPage() to display it.
     // Note : you can also use path relative to previously loaded page
     // Return value : same as SetPage
     // After the page is loaded, the method calls SetPage() to display it.
     // Note : you can also use path relative to previously loaded page
     // Return value : same as SetPage

-    bool LoadPage(const wxString& location);
+    virtual bool LoadPage(const wxString& location);

 
     // Returns full location of opened page
     wxString GetOpenedPage() const {return m_OpenedPage;}
 
     // Returns full location of opened page
     wxString GetOpenedPage() const {return m_OpenedPage;}


@@ -123,7 +136,18 @@ public:
     // Adds input filter
     static void AddFilter(wxHtmlFilter *filter);
 
     // Adds input filter
     static void AddFilter(wxHtmlFilter *filter);
 

-    // Called when users clicked on hypertext link. Default behavior is to
+    // Called when the mouse hovers over a cell: (x, y) are logical coords
+    //
+    // Default behaviour is to do nothing at all
+    virtual void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y);
+
+    // Called when user clicks on a cell. Default behavior is to call
+    // OnLinkClicked() if this cell corresponds to a hypertext link
+    virtual void OnCellClicked(wxHtmlCell *cell,
+                               wxCoord x, wxCoord y,
+                               const wxMouseEvent& event);
+
+    // Called when user clicked on hypertext link. Default behavior is to

     // call LoadPage(loc)
     virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
 
     // call LoadPage(loc)
     virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
 


@@ -135,7 +159,12 @@ 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; }
+

 protected:
 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)
     // 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)


@@ -192,6 +221,8 @@ private:
     bool m_tmpMouseMoved;
     // contains last link name
     wxHtmlLinkInfo *m_tmpLastLink;
     bool m_tmpMouseMoved;
     // contains last link name
     wxHtmlLinkInfo *m_tmpLastLink;

+    // contains the last (terminal) cell which contained the mouse
+    wxHtmlCell *m_tmpLastCell;

     // if >0 contents of the window is not redrawn
     // (in order to avoid ugly blinking)
     int m_tmpCanDrawLocks;
     // if >0 contents of the window is not redrawn
     // (in order to avoid ugly blinking)
     int m_tmpCanDrawLocks;


@@ -212,7 +243,7 @@ private:
 
     // html processors array:
     wxHtmlProcessorList *m_Processors;
 
     // html processors array:
     wxHtmlProcessorList *m_Processors;

-    static wxHtmlProcessorList *m_GlobalProcessors;    
+    static wxHtmlProcessorList *m_GlobalProcessors;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -221,3 +252,4 @@ private:
 #endif
 
 #endif // _WX_HTMLWIN_H_
 #endif
 
 #endif // _WX_HTMLWIN_H_

+