X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..61ecf6d34ffb087e4a02d1c4e29e1f155875eba0:/include/wx/html/htmltag.h

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 3d549e09cd..0dc91747ed 100644
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLTAG_H_
 #define _WX_HTMLTAG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "htmltag.h"
 #endif
 
@@ -60,13 +60,26 @@ class WXDLLEXPORT wxHtmlTag : public wxObject
 {
     DECLARE_CLASS(wxHtmlTag)
 
-public:
+protected:
     // constructs wxHtmlTag object based on HTML tag.
     // The tag begins (with '<' character) at position pos in source
     // end_pos is position where parsing ends (usually end of document)
-    wxHtmlTag(const wxString& source, int pos, int end_pos,
+    wxHtmlTag(wxHtmlTag *parent,
+              const wxString& source, int pos, int end_pos,
               wxHtmlTagsCache *cache,
-              wxHtmlEntitiesParser *entParser = NULL);
+              wxHtmlEntitiesParser *entParser);
+    friend class wxHtmlParser;
+public:
+    ~wxHtmlTag();
+
+    wxHtmlTag *GetParent() const {return m_Parent;}
+    wxHtmlTag *GetFirstSibling() const;
+    wxHtmlTag *GetLastSibling() const;
+    wxHtmlTag *GetChildren() const { return m_FirstChild; }
+    wxHtmlTag *GetPreviousSibling() const { return m_Prev; }
+    wxHtmlTag *GetNextSibling() const {return m_Next; }
+    // Return next tag, as if tree had been flattened
+    wxHtmlTag *GetNextTag() const;
 
     // Returns tag's name in uppercase.
     inline wxString GetName() const {return m_Name;}
@@ -94,17 +107,18 @@ public:
     // (like sscanf() does)
     // NOTE: unlike scanf family, this function only accepts
     //       *one* parameter !
-    int ScanParam(const wxString& par, wxChar *format, void *param) const;
+    int ScanParam(const wxString& par, const wxChar *format, void *param) const;
 
     // Returns string containing all params.
     wxString GetAllParams() const;
 
+#if WXWIN_COMPATIBILITY_2_2
     // return TRUE if this is ending tag (</something>) or FALSE
     // if it isn't (<something>)
-    inline bool IsEnding() const {return m_Ending;}
+    inline bool IsEnding() const {return FALSE;}
+#endif
 
-    // return TRUE if this is ending tag (</something>) or FALSE
-    // if it isn't (<something>)
+    // return TRUE if this there is matching ending tag
     inline bool HasEnding() const {return m_End1 >= 0;}
 
     // returns beginning position of _internal_ block of text
@@ -121,8 +135,13 @@ public:
 private:
     wxString m_Name;
     int m_Begin, m_End1, m_End2;
-    bool m_Ending;
     wxArrayString m_ParamNames, m_ParamValues;
+
+    // DOM tree relations:
+    wxHtmlTag *m_Next;
+    wxHtmlTag *m_Prev;
+    wxHtmlTag *m_FirstChild, *m_LastChild;
+    wxHtmlTag *m_Parent;
 };