wxConvGdk is not used anymore

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

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index d073212e79a40dc1d30b5e51fff6654a66b6c41d..4d476606f2ec90cb5c3f68895668bd26650724f5 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -4,7 +4,7 @@
 //              as a basic visual element of HTML page
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 //              as a basic visual element of HTML page
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$

-// Copyright:   (c) 1999 Vaclav Slavik
+// Copyright:   (c) 1999-2003 Vaclav Slavik

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,8 +12,8 @@
 #ifndef _WX_HTMLCELL_H_
 #define _WX_HTMLCELL_H_
 
 #ifndef _WX_HTMLCELL_H_
 #define _WX_HTMLCELL_H_
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "htmlcell.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -25,231 +25,453 @@
 #include "wx/window.h"
 
 
 #include "wx/window.h"
 
 

-class WXDLLEXPORT wxHtmlLinkInfo;
-class WXDLLEXPORT wxHtmlCell;
-class WXDLLEXPORT wxHtmlContainerCell;
+class WXDLLIMPEXP_HTML wxHtmlLinkInfo;
+class WXDLLIMPEXP_HTML wxHtmlCell;
+class WXDLLIMPEXP_HTML wxHtmlContainerCell;

 
 

-//--------------------------------------------------------------------------------
+
+// wxHtmlSelection is data holder with information about text selection.
+// Selection is defined by two positions (beginning and end of the selection)
+// and two leaf(!) cells at these positions.
+class WXDLLIMPEXP_HTML wxHtmlSelection
+{
+public:
+    wxHtmlSelection() 
+        : m_fromPos(wxDefaultPosition), m_toPos(wxDefaultPosition),
+          m_fromPrivPos(wxDefaultPosition), m_toPrivPos(wxDefaultPosition),
+          m_fromCell(NULL), m_toCell(NULL) {}
+
+    void Set(const wxPoint& fromPos, const wxHtmlCell *fromCell,
+             const wxPoint& toPos, const wxHtmlCell *toCell);
+    void Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell);
+    
+    const wxHtmlCell *GetFromCell() const { return m_fromCell; }
+    const wxHtmlCell *GetToCell() const { return m_toCell; }
+    
+    // these values are in absolute coordinates:
+    const wxPoint& GetFromPos() const { return m_fromPos; }
+    const wxPoint& GetToPos() const { return m_toPos; }
+    
+    // these are From/ToCell's private data
+    const wxPoint& GetFromPrivPos() const { return m_fromPrivPos; }
+    const wxPoint& GetToPrivPos() const { return m_toPrivPos; }
+    void SetFromPrivPos(const wxPoint& pos) { m_fromPrivPos = pos; }
+    void SetToPrivPos(const wxPoint& pos) { m_toPrivPos = pos; }
+    void ClearPrivPos() { m_toPrivPos = m_fromPrivPos = wxDefaultPosition; }
+
+    const bool IsEmpty() const 
+        { return m_fromPos == wxDefaultPosition && 
+                 m_toPos == wxDefaultPosition; }
+
+private:
+    wxPoint m_fromPos, m_toPos;
+    wxPoint m_fromPrivPos, m_toPrivPos;
+    const wxHtmlCell *m_fromCell, *m_toCell;
+};
+
+
+
+enum wxHtmlSelectionState
+{
+    wxHTML_SEL_OUT,     // currently rendered cell is outside the selection
+    wxHTML_SEL_IN,      // ... is inside selection
+    wxHTML_SEL_CHANGING // ... is the cell on which selection state changes
+};
+
+// Selection state is passed to wxHtmlCell::Draw so that it can render itself
+// differently e.g. when inside text selection or outside it.
+class WXDLLIMPEXP_HTML wxHtmlRenderingState
+{
+public:
+    wxHtmlRenderingState() : m_selState(wxHTML_SEL_OUT) {}
+
+    void SetSelectionState(wxHtmlSelectionState s) { m_selState = s; }  
+    wxHtmlSelectionState GetSelectionState() const { return m_selState; }
+
+    void SetFgColour(const wxColour& c) { m_fgColour = c; }
+    const wxColour& GetFgColour() const { return m_fgColour; }
+    void SetBgColour(const wxColour& c) { m_bgColour = c; }
+    const wxColour& GetBgColour() const { return m_bgColour; }
+    
+private:
+    wxHtmlSelectionState  m_selState;
+    wxColour              m_fgColour, m_bgColour;
+};
+
+
+// HTML rendering customization. This class is used when rendering wxHtmlCells
+// as a callback:
+class WXDLLIMPEXP_HTML wxHtmlRenderingStyle
+{
+public:
+    virtual wxColour GetSelectedTextColour(const wxColour& clr) = 0;
+    virtual wxColour GetSelectedTextBgColour(const wxColour& clr) = 0;
+};
+
+// Standard style:
+class WXDLLIMPEXP_HTML wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle
+{
+public:
+    virtual wxColour GetSelectedTextColour(const wxColour& clr);
+    virtual wxColour GetSelectedTextBgColour(const wxColour& clr);
+};
+
+
+// Information given to cells when drawing them. Contains rendering state,
+// selection information and rendering style object that can be used to
+// customize the output.
+class WXDLLIMPEXP_HTML wxHtmlRenderingInfo
+{
+public:
+    wxHtmlRenderingInfo() : m_selection(NULL), m_style(NULL) {}
+
+    void SetSelection(wxHtmlSelection *s) { m_selection = s; }
+    wxHtmlSelection *GetSelection() const { return m_selection; }
+    
+    void SetStyle(wxHtmlRenderingStyle *style) { m_style = style; }
+    wxHtmlRenderingStyle& GetStyle() { return *m_style; }
+
+    wxHtmlRenderingState& GetState() { return m_state; }
+    
+protected:
+    wxHtmlSelection      *m_selection;
+    wxHtmlRenderingStyle *m_style;
+    wxHtmlRenderingState m_state;
+};
+
+
+// Flags for wxHtmlCell::FindCellByPos
+enum
+{
+    wxHTML_FIND_EXACT             = 1,
+    wxHTML_FIND_NEAREST_BEFORE    = 2,
+    wxHTML_FIND_NEAREST_AFTER     = 4
+};
+
+
+
+
+// ---------------------------------------------------------------------------

 // wxHtmlCell
 // wxHtmlCell

-//                  Internal data structure. It represents fragments of parsed HTML
-//                  page - a word, picture, table, horizontal line and so on.
-//                  It is used by wxHtmlWindow to represent HTML page in memory.
-//--------------------------------------------------------------------------------
+//                  Internal data structure. It represents fragments of parsed
+//                  HTML page - a word, picture, table, horizontal line and so
+//                  on.  It is used by wxHtmlWindow to represent HTML page in
+//                  memory.
+// ---------------------------------------------------------------------------

 
 
 
 

-class WXDLLEXPORT wxHtmlCell : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlCell : public wxObject

 {
 {

-    public:
-        wxHtmlCell();
-        virtual ~wxHtmlCell();
-
-        void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
-        wxHtmlContainerCell *GetParent() const {return m_Parent;}
-
-        int GetPosX() const {return m_PosX;}
-        int GetPosY() const {return m_PosY;}
-        int GetWidth() const {return m_Width;}
-        int GetHeight() const {return m_Height;}
-        int GetDescent() const {return m_Descent;}
-        virtual wxHtmlLinkInfo* GetLink(int WXUNUSED(x) = 0,
-                                 int WXUNUSED(y) = 0) const
-            { return m_Link; }
-                // returns the link associated with this cell. The position is position within
-                // the cell so it varies from 0 to m_Width, from 0 to m_Height
-        wxHtmlCell *GetNext() const {return m_Next;}
-                // members access methods
-
-        virtual void SetPos(int x, int y) {m_PosX = x, m_PosY = y;}
-        void SetLink(const wxHtmlLinkInfo& link);
-        void SetNext(wxHtmlCell *cell) {m_Next = cell;}
-                // members writin methods
-
-        virtual void Layout(int w) {SetPos(0, 0); if (m_Next) m_Next -> Layout(w);};
-                // 1. adjust cell's width according to the fact that maximal possible width is w.
-                //    (this has sense when working with horizontal lines, tables etc.)
-                // 2. prepare layout (=fill-in m_PosX, m_PosY (and sometime m_Height) members)
-                //    = place items to fit window, according to the width w
-
-        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) {if (m_Next) m_Next -> Draw(dc, x, y, view_y1, view_y2);}
-                // renders the cell
-
-        virtual void DrawInvisible(wxDC& dc, int x, int y) {if (m_Next) m_Next -> DrawInvisible(dc, x, y);};
-                // proceed drawing actions in case the cell is not visible (scrolled out of screen).
-                // This is needed to change fonts, colors and so on
-
-        virtual const wxHtmlCell* Find(int condition, const void* param) const {if (m_Next) return m_Next -> Find(condition, param); else return NULL;}
-                // This method returns pointer to the FIRST cell for that
-                // the condition
-                // is true. It first checks if the condition is true for this
-                // cell and then calls m_Next -> Find(). (Note: it checks
-                // all subcells if the cell is container)
-                // Condition is unique condition identifier (see htmldefs.h)
-                // (user-defined condition IDs should start from 10000)
-                // and param is optional parameter
-                // Example : m_Cell -> Find(wxHTML_COND_ISANCHOR, "news");
-                //   returns pointer to anchor news
-
-        virtual void OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right);
-                // This function is called when mouse button is clicked over the cell.
-                // left, middle, right are flags indicating whether the button was or wasn't
-                // pressed.
-                // Parent is pointer to wxHtmlWindow that generated the event
-                // HINT: if this handling is not enough for you you should use
-                //       wxHtmlBinderCell
-
-        virtual bool AdjustPagebreak(int *pagebreak);
-                // This method used to adjust pagebreak position. The parameter is
-                // variable that contains y-coordinate of page break (= horizontal line that
-                // should not be crossed by words, images etc.). If this cell cannot be divided
-                // into two pieces (each one on another page) then it moves the pagebreak
-                // few pixels up.
-                //
-                // Returned value : true if pagebreak was modified, false otherwise
-                // Usage : while (container->AdjustPagebreak(&p)) {}
-
-        void SetCanLiveOnPagebreak(bool can) {m_CanLiveOnPagebreak = can;}
-                // Sets cell's behaviour on pagebreaks (see AdjustPagebreak). Default
-                // is true - the cell can be split on two pages
-
-
-    protected:
-        wxHtmlCell *m_Next;
-                // pointer to the next cell
-        wxHtmlContainerCell *m_Parent;
+public:
+    wxHtmlCell();
+    virtual ~wxHtmlCell();
+
+    void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
+    wxHtmlContainerCell *GetParent() const {return m_Parent;}
+
+    int GetPosX() const {return m_PosX;}
+    int GetPosY() const {return m_PosY;}
+    int GetWidth() const {return m_Width;}
+    int GetHeight() const {return m_Height;}
+    int GetDescent() const {return m_Descent;}
+
+    const wxString& GetId() const { return m_id; }
+    void SetId(const wxString& id) { m_id = id; }
+
+    // returns the link associated with this cell. The position is position
+    // within the cell so it varies from 0 to m_Width, from 0 to m_Height
+    virtual wxHtmlLinkInfo* GetLink(int WXUNUSED(x) = 0,
+                                    int WXUNUSED(y) = 0) const
+        { return m_Link; }
+
+    // Returns cursor to be used when mouse is over the cell:
+    virtual wxCursor GetCursor() const;
+
+    // return next cell among parent's cells
+    wxHtmlCell *GetNext() const {return m_Next;}
+    // returns first child cell (if there are any, i.e. if this is container):
+    virtual wxHtmlCell* GetFirstChild() const { return NULL; }
+
+    // members writing methods
+    virtual void SetPos(int x, int y) {m_PosX = x, m_PosY = y;}
+    void SetLink(const wxHtmlLinkInfo& link);
+    void SetNext(wxHtmlCell *cell) {m_Next = cell;}
+
+    // 1. adjust cell's width according to the fact that maximal possible width
+    //    is w.  (this has sense when working with horizontal lines, tables
+    //    etc.)
+    // 2. prepare layout (=fill-in m_PosX, m_PosY (and sometime m_Height)
+    //    members) = place items to fit window, according to the width w
+    virtual void Layout(int w);
+
+    // renders the cell
+    virtual void Draw(wxDC& WXUNUSED(dc),
+                      int WXUNUSED(x), int WXUNUSED(y),
+                      int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                      wxHtmlRenderingInfo& WXUNUSED(info)) {}
+
+    // proceed drawing actions in case the cell is not visible (scrolled out of
+    // screen).  This is needed to change fonts, colors and so on.
+    virtual void DrawInvisible(wxDC& WXUNUSED(dc),
+                               int WXUNUSED(x), int WXUNUSED(y),
+                               wxHtmlRenderingInfo& WXUNUSED(info)) {}
+
+    // This method returns pointer to the FIRST cell for that
+    // the condition
+    // is true. It first checks if the condition is true for this
+    // cell and then calls m_Next->Find(). (Note: it checks
+    // all subcells if the cell is container)
+    // Condition is unique condition identifier (see htmldefs.h)
+    // (user-defined condition IDs should start from 10000)
+    // and param is optional parameter
+    // Example : m_Cell->Find(wxHTML_COND_ISANCHOR, "news");
+    //   returns pointer to anchor news
+    virtual const wxHtmlCell* Find(int condition, const void* param) const;
+
+    // This function is called when mouse button is clicked over the cell.
+    //
+    // Parent is pointer to wxHtmlWindow that generated the event
+    // HINT: if this handling is not enough for you you should use
+    //       wxHtmlWidgetCell
+    virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event);
+
+    // This method used to adjust pagebreak position. The parameter is variable
+    // that contains y-coordinate of page break (= horizontal line that should
+    // not be crossed by words, images etc.). If this cell cannot be divided
+    // into two pieces (each one on another page) then it moves the pagebreak
+    // few pixels up.
+    //
+    // Returned value : true if pagebreak was modified, false otherwise
+    // Usage : while (container->AdjustPagebreak(&p)) {}
+    virtual bool AdjustPagebreak(int *pagebreak,
+                                 int *known_pagebreaks = NULL,
+                                 int number_of_pages = 0) const;
+
+    // Sets cell's behaviour on pagebreaks (see AdjustPagebreak). Default
+    // is true - the cell can be split on two pages
+    void SetCanLiveOnPagebreak(bool can) { m_CanLiveOnPagebreak = can; }
+
+    // Returns y-coordinates that contraint the cell, i.e. left is highest
+    // and right lowest coordinate such that the cell lays between then.
+    // Note: this method does not return meaningful values if you haven't
+    //       called Layout() before!
+    virtual void GetHorizontalConstraints(int *left, int *right) const;
+
+    // Returns true for simple == terminal cells, i.e. not composite ones.
+    // This if for internal usage only and may disappear in future versions!
+    virtual bool IsTerminalCell() const { return TRUE; }
+
+    // Find a cell inside this cell positioned at the given coordinates
+    // (relative to this's positions). Returns NULL if no such cell exists.
+    // The flag can be used to specify whether to look for terminal or
+    // nonterminal cells or both. In either case, returned cell is deepest
+    // cell in cells tree that contains [x,y].
+    virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y,
+                                  unsigned flags = wxHTML_FIND_EXACT) const;
+
+    // Returns absolute position of the cell on HTML canvas
+    wxPoint GetAbsPos() const;
+
+    // Returns first (last) terminal cell inside this cell. It may return NULL,
+    // but it is rare -- only if there are no terminals in the tree.
+    virtual wxHtmlCell *GetFirstTerminal() const 
+        { return wxConstCast(this, wxHtmlCell); }
+    virtual wxHtmlCell *GetLastTerminal() const 
+        { return wxConstCast(this, wxHtmlCell); }
+
+    // Returns cell's depth, i.e. how far under the root cell it is
+    // (if it is the root, depth is 0)
+    unsigned GetDepth() const;
+    
+    // Returns true if the cell appears before 'cell' in natural order of
+    // cells (= as they are read). If cell A is (grand)parent of cell B,
+    // then both A.IsBefore(B) and B.IsBefore(A) always return true.
+    bool IsBefore(wxHtmlCell *cell) const;
+    
+    // Converts the cell into text representation. If sel != NULL then
+    // only part of the cell inside the selection is converted.
+    virtual wxString ConvertToText(wxHtmlSelection *WXUNUSED(sel)) const
+        { return wxEmptyString; }
+
+protected:
+    wxHtmlCell *m_Next;
+            // pointer to the next cell
+    wxHtmlContainerCell *m_Parent;

             // pointer to parent cell
             // pointer to parent cell

-        long m_Width, m_Height, m_Descent;
-                // dimensions of fragment
-                // m_Descent is used to position text&images..
-        long m_PosX, m_PosY;
-                // position where the fragment is drawn
-        wxHtmlLinkInfo *m_Link;
-                // destination address if this fragment is hypertext link, "" otherwise
-        bool m_CanLiveOnPagebreak;
-                // true if this cell can be placed on pagebreak, false otherwise
-
+    long m_Width, m_Height, m_Descent;
+            // dimensions of fragment
+            // m_Descent is used to position text&images..
+    long m_PosX, m_PosY;
+            // position where the fragment is drawn
+    wxHtmlLinkInfo *m_Link;
+            // destination address if this fragment is hypertext link, NULL otherwise
+    bool m_CanLiveOnPagebreak;
+            // true if this cell can be placed on pagebreak, false otherwise
+    wxString m_id;
+            // unique identifier of the cell, generated from "id" property of tags
+
+    DECLARE_NO_COPY_CLASS(wxHtmlCell)

 };
 
 
 
 
 };
 
 
 
 

-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // Inherited cells:
 // Inherited cells:

-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 
 
 

-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxHtmlWordCell
 //                  Single word in input stream.
 // wxHtmlWordCell
 //                  Single word in input stream.

-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxHtmlWordCell : public wxHtmlCell
+class WXDLLIMPEXP_HTML wxHtmlWordCell : public wxHtmlCell

 {
 {

-    protected:
-        wxString m_Word;
-
-    public:
-        wxHtmlWordCell(const wxString& word, wxDC& dc);
-        void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
+public:
+    wxHtmlWordCell(const wxString& word, wxDC& dc);
+    void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
+              wxHtmlRenderingInfo& info);
+    wxCursor GetCursor() const;
+    wxString ConvertToText(wxHtmlSelection *sel) const;
+
+protected:
+    void SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const;
+    void Split(wxDC& dc,
+               const wxPoint& selFrom, const wxPoint& selTo,
+               unsigned& pos1, unsigned& pos2) const;
+    
+    wxString m_Word;

 };
 
 
 
 
 
 };
 
 
 
 
 

-//--------------------------------------------------------------------------------
-// wxHtmlContainerCell
-//                  Container - it contains other cells. Basic of layout algorithm.
-//--------------------------------------------------------------------------------
-
-class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
+// Container contains other cells, thus forming tree structure of rendering
+// elements. Basic code of layout algorithm is contained in this class.
+class WXDLLIMPEXP_HTML wxHtmlContainerCell : public wxHtmlCell

 {
 {

-    protected:
-        int m_IndentLeft, m_IndentRight, m_IndentTop, m_IndentBottom;
-                // indentation of subcells. There is always m_Indent pixels
-                // big space between given border of the container and the subcells
-                // it m_Indent < 0 it is in PERCENTS, otherwise it is in pixels
-        int m_MinHeight, m_MinHeightAlign;
-            // minimal height.
-        int m_MaxLineWidth;
-            // maximal widht of line. Filled during Layout()
-        wxHtmlCell *m_Cells, *m_LastCell;
-                // internal cells, m_Cells points to the first of them, m_LastCell to the last one.
-                // (LastCell is needed only to speed-up InsertCell)
-        int m_AlignHor, m_AlignVer;
-                // alignment horizontal and vertical (left, center, right)
-        int m_WidthFloat, m_WidthFloatUnits;
-                // width float is used in adjustWidth
-        bool m_UseBkColour;
-        wxColour m_BkColour;
-                // background color of this container
-        bool m_UseBorder;
-        wxColour m_BorderColour1, m_BorderColour2;
-                // borders color of this container
-
-    public:
-        wxHtmlContainerCell(wxHtmlContainerCell *parent);
-        ~wxHtmlContainerCell() {if (m_Cells) delete m_Cells;}
-
-        virtual void Layout(int w);
-        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-        virtual void DrawInvisible(wxDC& dc, int x, int y);
-        virtual bool AdjustPagebreak(int *pagebreak);
-
-        void InsertCell(wxHtmlCell *cell);
-                // insert cell at the end of m_Cells list
-        void SetAlignHor(int al) {m_AlignHor = al;}
-        int GetAlignHor() const {return m_AlignHor;}
-        void SetAlignVer(int al) {m_AlignVer = al;}
-                // sets horizontal/vertical alignment
-        int GetAlignVer() const {return m_AlignVer;}
-        void SetIndent(int i, int what, int units = wxHTML_UNITS_PIXELS);
-                // sets left-border indentation. units is one of wxHTML_UNITS_* constants
-                // what is combination of wxHTML_INDENT_*
-        int GetIndent(int ind) const;
-                // returns the indentation. ind is one of wxHTML_INDENT_* constants
-        int GetIndentUnits(int ind) const;
-                // returns type of value returned by GetIndent(ind)
-        void SetAlign(const wxHtmlTag& tag);
-                // sets alignment info based on given tag's params
-        void SetWidthFloat(int w, int units) {m_WidthFloat = w; m_WidthFloatUnits = units;}
-        void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0);
-                // sets floating width adjustment
-                // (examples : 32 percent of parent container,
-                // -15 pixels percent (this means 100 % - 15 pixels)
-        void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align;}
-                // sets minimal height of this container.
-        int GetMaxLineWidth() const {return m_MaxLineWidth;}
-            // returns maximal line width in this container.
-            // Call to this method is valid only after calling
-            // Layout()
-        void SetBackgroundColour(const wxColour& clr) {m_UseBkColour = TRUE; m_BkColour = clr;}
-        void SetBorder(const wxColour& clr1, const wxColour& clr2) {m_UseBorder = TRUE; m_BorderColour1 = clr1, m_BorderColour2 = clr2;}
-        virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;
-        virtual const wxHtmlCell* Find(int condition, const void* param) const;
-        virtual void OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right);
-
-        wxHtmlCell* GetFirstCell() {return m_Cells;}
-                // returns pointer to the first cell in container or NULL
+public:
+    wxHtmlContainerCell(wxHtmlContainerCell *parent);
+    ~wxHtmlContainerCell();
+
+    virtual void Layout(int w);
+    virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
+                      wxHtmlRenderingInfo& info);
+    virtual void DrawInvisible(wxDC& dc, int x, int y,
+                               wxHtmlRenderingInfo& info);
+    virtual bool AdjustPagebreak(int *pagebreak, int *known_pagebreaks = NULL, int number_of_pages = 0) const;
+
+    // insert cell at the end of m_Cells list
+    void InsertCell(wxHtmlCell *cell);
+
+    // sets horizontal/vertical alignment
+    void SetAlignHor(int al) {m_AlignHor = al; m_LastLayout = -1;}
+    int GetAlignHor() const {return m_AlignHor;}
+    void SetAlignVer(int al) {m_AlignVer = al; m_LastLayout = -1;}
+    int GetAlignVer() const {return m_AlignVer;}
+
+    // sets left-border indentation. units is one of wxHTML_UNITS_* constants
+    // what is combination of wxHTML_INDENT_*
+    void SetIndent(int i, int what, int units = wxHTML_UNITS_PIXELS);
+    // returns the indentation. ind is one of wxHTML_INDENT_* constants
+    int GetIndent(int ind) const;
+    // returns type of value returned by GetIndent(ind)
+    int GetIndentUnits(int ind) const;
+
+    // sets alignment info based on given tag's params
+    void SetAlign(const wxHtmlTag& tag);
+    // sets floating width adjustment
+    // (examples : 32 percent of parent container,
+    // -15 pixels percent (this means 100 % - 15 pixels)
+    void SetWidthFloat(int w, int units) {m_WidthFloat = w; m_WidthFloatUnits = units; m_LastLayout = -1;}
+    void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0);
+    // sets minimal height of this container.
+    void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align; m_LastLayout = -1;}
+
+    void SetBackgroundColour(const wxColour& clr) {m_UseBkColour = TRUE; m_BkColour = clr;}
+    // returns background colour (of wxNullColour if none set), so that widgets can
+    // adapt to it:
+    wxColour GetBackgroundColour();
+    void SetBorder(const wxColour& clr1, const wxColour& clr2) {m_UseBorder = TRUE; m_BorderColour1 = clr1, m_BorderColour2 = clr2;}
+    virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;
+    virtual const wxHtmlCell* Find(int condition, const void* param) const;
+    virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event);
+    virtual void GetHorizontalConstraints(int *left, int *right) const;
+
+    virtual wxHtmlCell* GetFirstChild() const { return m_Cells; }
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( wxHtmlCell* GetFirstCell() const );
+#endif
+
+    // see comment in wxHtmlCell about this method
+    virtual bool IsTerminalCell() const { return FALSE; }
+
+    virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y,
+                                  unsigned flags = wxHTML_FIND_EXACT) const;
+    
+    virtual wxHtmlCell *GetFirstTerminal() const;
+    virtual wxHtmlCell *GetLastTerminal() const;
+
+protected:
+    void UpdateRenderingStatePre(wxHtmlRenderingInfo& info,
+                                 wxHtmlCell *cell) const;
+    void UpdateRenderingStatePost(wxHtmlRenderingInfo& info,
+                                  wxHtmlCell *cell) const;
+    
+protected:
+    int m_IndentLeft, m_IndentRight, m_IndentTop, m_IndentBottom;
+            // indentation of subcells. There is always m_Indent pixels
+            // big space between given border of the container and the subcells
+            // it m_Indent < 0 it is in PERCENTS, otherwise it is in pixels
+    int m_MinHeight, m_MinHeightAlign;
+        // minimal height.
+    wxHtmlCell *m_Cells, *m_LastCell;
+            // internal cells, m_Cells points to the first of them, m_LastCell to the last one.
+            // (LastCell is needed only to speed-up InsertCell)
+    int m_AlignHor, m_AlignVer;
+            // alignment horizontal and vertical (left, center, right)
+    int m_WidthFloat, m_WidthFloatUnits;
+            // width float is used in adjustWidth
+    bool m_UseBkColour;
+    wxColour m_BkColour;
+            // background color of this container
+    bool m_UseBorder;
+    wxColour m_BorderColour1, m_BorderColour2;
+            // borders color of this container
+    int m_LastLayout;
+            // if != -1 then call to Layout may be no-op
+            // if previous call to Layout has same argument
+
+    DECLARE_NO_COPY_CLASS(wxHtmlContainerCell)

 };
 
 };
 

+#if WXWIN_COMPATIBILITY_2_4
+inline wxHtmlCell* wxHtmlContainerCell::GetFirstCell() const
+    { return GetFirstChild(); }
+#endif

 
 
 
 
 
 
 
 

-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------

 // wxHtmlColourCell
 //                  Color changer.
 // wxHtmlColourCell
 //                  Color changer.

-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxHtmlColourCell : public wxHtmlCell
+class WXDLLIMPEXP_HTML wxHtmlColourCell : public wxHtmlCell

 {
 {

-    public:
-        wxColour m_Colour;
-        unsigned m_Flags;
-
-        wxHtmlColourCell(wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;}
-        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-        virtual void DrawInvisible(wxDC& dc, int x, int y);
+public:
+    wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;}
+    virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
+                      wxHtmlRenderingInfo& info);
+    virtual void DrawInvisible(wxDC& dc, int x, int y,
+                               wxHtmlRenderingInfo& info);
+
+protected:
+    wxColour m_Colour;
+    unsigned m_Flags;

 };
 
 
 };
 
 


@@ -260,14 +482,17 @@ class WXDLLEXPORT wxHtmlColourCell : public wxHtmlCell
 //                  Sets actual font used for text rendering
 //--------------------------------------------------------------------------------
 
 //                  Sets actual font used for text rendering
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell
+class WXDLLIMPEXP_HTML wxHtmlFontCell : public wxHtmlCell

 {
 {

-    public:
-        wxFont m_Font;
-
-        wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); }
-        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-        virtual void DrawInvisible(wxDC& dc, int x, int y);
+public:
+    wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); }
+    virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
+                      wxHtmlRenderingInfo& info);
+    virtual void DrawInvisible(wxDC& dc, int x, int y,
+                               wxHtmlRenderingInfo& info);
+
+protected:
+    wxFont m_Font;

 };
 
 
 };
 
 


@@ -282,23 +507,27 @@ class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell
 //                  (buttons, input boxes etc.)
 //--------------------------------------------------------------------------------
 
 //                  (buttons, input boxes etc.)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHtmlWidgetCell : public wxHtmlCell
+class WXDLLIMPEXP_HTML wxHtmlWidgetCell : public wxHtmlCell

 {
 {

-    protected:
-        wxWindow* m_Wnd;
-        int m_WidthFloat;
-                // width float is used in adjustWidth (it is in percents)
-
-    public:
-        wxHtmlWidgetCell(wxWindow *wnd, int w = 0);
-                // !!! wnd must have correct parent!
-                // if w != 0 then the m_Wnd has 'floating' width - it adjust
-                // it's width according to parent container's width
-                // (w is percent of parent's width)
-        ~wxHtmlWidgetCell() {if (m_Wnd) m_Wnd -> Destroy(); }
-        virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-        virtual void DrawInvisible(wxDC& dc, int x, int y);
-        virtual void Layout(int w);
+public:
+    // !!! wnd must have correct parent!
+    // if w != 0 then the m_Wnd has 'floating' width - it adjust
+    // it's width according to parent container's width
+    // (w is percent of parent's width)
+    wxHtmlWidgetCell(wxWindow *wnd, int w = 0);
+    ~wxHtmlWidgetCell() { m_Wnd->Destroy(); }
+    virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
+                      wxHtmlRenderingInfo& info);
+    virtual void DrawInvisible(wxDC& dc, int x, int y,
+                               wxHtmlRenderingInfo& info);
+    virtual void Layout(int w);
+
+protected:
+    wxWindow* m_Wnd;
+    int m_WidthFloat;
+            // width float is used in adjustWidth (it is in percents)
+
+    DECLARE_NO_COPY_CLASS(wxHtmlWidgetCell)

 };
 
 
 };
 
 


@@ -308,27 +537,56 @@ class WXDLLEXPORT wxHtmlWidgetCell : public wxHtmlCell
 //                  Internal data structure. It represents hypertext link
 //--------------------------------------------------------------------------------
 
 //                  Internal data structure. It represents hypertext link
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHtmlLinkInfo : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlLinkInfo : public wxObject

 {
 {

-    public:
-        wxHtmlLinkInfo() : wxObject()
-                { m_Href = m_Target = wxEmptyString; }
-        wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject()
-                { m_Href = href; m_Target = target; }
-        wxHtmlLinkInfo(const wxHtmlLinkInfo& l)
-                { m_Href = l.m_Href, m_Target = l.m_Target; }
-        wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l)
-                { m_Href = l.m_Href, m_Target = l.m_Target; return *this; }
-
-        wxString GetHref() const { return m_Href; }
-        wxString GetTarget() const { return m_Target; }
-
-    private:
-        wxString m_Href, m_Target;
+public:
+    wxHtmlLinkInfo() : wxObject()
+          { m_Href = m_Target = wxEmptyString; m_Event = NULL, m_Cell = NULL; }
+    wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject()
+          { m_Href = href; m_Target = target; m_Event = NULL, m_Cell = NULL; }
+    wxHtmlLinkInfo(const wxHtmlLinkInfo& l) : wxObject()
+          { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event;
+            m_Cell = l.m_Cell; }
+    wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l)
+          { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event;
+            m_Cell = l.m_Cell; return *this; }
+
+    void SetEvent(const wxMouseEvent *e) { m_Event = e; }
+    void SetHtmlCell(const wxHtmlCell *e) { m_Cell = e; }
+
+    wxString GetHref() const { return m_Href; }
+    wxString GetTarget() const { return m_Target; }
+    const wxMouseEvent* GetEvent() const { return m_Event; }
+    const wxHtmlCell* GetHtmlCell() const { return m_Cell; }
+
+private:
+    wxString m_Href, m_Target;
+    const wxMouseEvent *m_Event;
+    const wxHtmlCell *m_Cell;

 };
 
 
 
 };
 
 
 

+// ----------------------------------------------------------------------------
+// wxHtmlTerminalCellsInterator
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_HTML wxHtmlTerminalCellsInterator
+{
+public:
+    wxHtmlTerminalCellsInterator(const wxHtmlCell *from, const wxHtmlCell *to)
+        : m_to(to), m_pos(from) {}
+
+    operator bool() const { return m_pos != NULL; }
+    const wxHtmlCell* operator++();
+    const wxHtmlCell* operator->() const { return m_pos; }
+    const wxHtmlCell* operator*() const { return m_pos; }
+
+private:
+    const wxHtmlCell *m_to, *m_pos;
+};
+
+

 
 #endif // wxUSE_HTML
 
 
 #endif // wxUSE_HTML