X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9749497156909657d17ef972857caaca4bd09da2..e564aa153eb1dc5ebd9f8c9f5f055c2a49c15b05:/include/wx/html/htmltag.h
diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 7ce80f3629..758e1d3a0e 100644
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -16,8 +16,14 @@
#endif
#include "wx/defs.h"
+
#if wxUSE_HTML
+#include "wx/object.h"
+
+class WXDLLEXPORT wxColour;
+class WXDLLEXPORT wxHtmlEntitiesParser;
+
//-----------------------------------------------------------------------------
// wxHtmlTagsCache
// - internal wxHTML class, do not use!
@@ -25,7 +31,7 @@
struct wxHtmlCacheItem;
-class wxHtmlTagsCache : public wxObject
+class WXDLLEXPORT wxHtmlTagsCache : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache)
@@ -54,11 +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, wxHtmlTagsCache* cache);
+ wxHtmlTag(wxHtmlTag *parent,
+ const wxString& source, int pos, int end_pos,
+ wxHtmlTagsCache *cache,
+ 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;}
@@ -75,24 +96,29 @@ public:
// (or ("WhaT.jpg") if with_commas == TRUE)
wxString GetParam(const wxString& par, bool with_commas = FALSE) const;
- // Scans param like scanf() functions family do.
+ // Convenience functions:
+ bool GetParamAsColour(const wxString& par, wxColour *clr) const;
+ bool GetParamAsInt(const wxString& par, int *clr) const;
+
+ // Scans param like scanf() functions family does.
// Example : ScanParam("COLOR", "\"#%X\"", &clr);
// This is always with with_commas=FALSE
// Returns number of scanned values
// (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.
- inline const wxString& GetAllParams() const {return m_Params;}
+ wxString GetAllParams() const;
+#if WXWIN_COMPATIBILITY_2_2
// return TRUE if this is ending tag () or FALSE
// if it isn't ()
- inline bool IsEnding() const {return m_Ending;}
+ inline bool IsEnding() const {return FALSE;}
+#endif
- // return TRUE if this is ending tag () or FALSE
- // if it isn't ()
+ // 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
@@ -107,9 +133,15 @@ public:
inline int GetEndPos2() const {return m_End2;}
private:
- wxString m_Name, m_Params;
+ 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;
};