reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 55016f205d20181e8b2a9af5c90ef7aa8ab72801..59b6f265a821c866fb003b6c6d146527091cea5d 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -52,6 +52,9 @@ public:
     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
@@ -94,7 +97,7 @@ public:
     //
     // Parent is pointer to wxHtmlWindow that generated the event
     // HINT: if this handling is not enough for you you should use
-    //       wxHtmlBinderCell
+    //       wxHtmlWidgetCell
     virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event);
 
     // This method used to adjust pagebreak position. The parameter is
@@ -111,7 +114,7 @@ public:
     // 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 
+    // 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!
@@ -119,7 +122,7 @@ public:
 
     // 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; }
+    virtual bool IsTerminalCell() const { return TRUE; }
 
     // Find the terminal cell inside this cell at the given position (relative
     // to this cell)
@@ -141,6 +144,8 @@ protected:
             // 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
 };
 
 
@@ -224,7 +229,7 @@ public:
     wxHtmlCell* GetFirstCell() const {return m_Cells;}
 
     // see comment in wxHtmlCell about this method
-    virtual bool IsTerminalCell() const { return false; }
+    virtual bool IsTerminalCell() const { return FALSE; }
 
     virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y) const;