X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7640339e92492ee1ee32384f471cce0f9f169fa..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 92a93438a3..46f724cc78 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -17,34 +17,37 @@ #include "wx/object.h" #include "wx/arrstr.h" -class WXDLLIMPEXP_CORE wxColour; -class WXDLLIMPEXP_HTML wxHtmlEntitiesParser; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser; //----------------------------------------------------------------------------- // wxHtmlTagsCache // - internal wxHTML class, do not use! //----------------------------------------------------------------------------- -struct wxHtmlCacheItem; +class wxHtmlTagsCacheData; -class WXDLLIMPEXP_HTML wxHtmlTagsCache : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTagsCache { - DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache) - private: - wxHtmlCacheItem *m_Cache; - int m_CacheSize; + wxHtmlTagsCacheData *m_Cache; int m_CachePos; + wxHtmlTagsCacheData& Cache() { return *m_Cache; } + public: - wxHtmlTagsCache() : wxObject() {m_CacheSize = 0; m_Cache = NULL;} + wxHtmlTagsCache() {m_Cache = NULL;} wxHtmlTagsCache(const wxString& source); - virtual ~wxHtmlTagsCache() {free(m_Cache);} + virtual ~wxHtmlTagsCache(); // Finds parameters for tag starting at at and fills the variables - void QueryTag(int at, int* end1, int* end2); + void QueryTag(const wxString::const_iterator& at, + const wxString::const_iterator& inputEnd, + wxString::const_iterator *end1, + wxString::const_iterator *end2, + bool *hasEnding); - DECLARE_NO_COPY_CLASS(wxHtmlTagsCache) + wxDECLARE_NO_COPY_CLASS(wxHtmlTagsCache); }; @@ -54,21 +57,21 @@ public: // by wxHtmlParser. //-------------------------------------------------------------------------------- -class WXDLLIMPEXP_HTML wxHtmlTag : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTag { - DECLARE_CLASS(wxHtmlTag) - 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(wxHtmlTag *parent, - const wxString& source, int pos, int end_pos, + const wxString *source, + const wxString::const_iterator& pos, + const wxString::const_iterator& end_pos, wxHtmlTagsCache *cache, wxHtmlEntitiesParser *entParser); friend class wxHtmlParser; public: - virtual ~wxHtmlTag(); + ~wxHtmlTag(); wxHtmlTag *GetParent() const {return m_Parent;} wxHtmlTag *GetFirstSibling() const; @@ -91,8 +94,8 @@ public: // enclosed with " // Example :
GetParam("ALIGN") returns (RIGHT) //
GetParam("SRC") returns (WhaT.jpg)
- // (or ("WhaT.jpg") if with_commas == true)
- wxString GetParam(const wxString& par, bool with_commas = false) const;
+ // (or ("WhaT.jpg") if with_quotes == true)
+ wxString GetParam(const wxString& par, bool with_quotes = false) const;
// Convenience functions:
bool GetParamAsColour(const wxString& par, wxColour *clr) const;
@@ -100,7 +103,7 @@ public:
// Scans param like scanf() functions family does.
// Example : ScanParam("COLOR", "\"#%X\"", &clr);
- // This is always with with_commas=false
+ // This is always with with_quotes=false
// Returns number of scanned values
// (like sscanf() does)
// NOTE: unlike scanf family, this function only accepts
@@ -111,24 +114,39 @@ public:
// Returns string containing all params.
wxString GetAllParams() const;
- // return true if this there is matching ending tag
- inline bool HasEnding() const {return m_End1 >= 0;}
+ // return true if there is matching ending tag
+ inline bool HasEnding() const {return m_hasEnding;}
- // returns beginning position of _internal_ block of text
+ // returns beginning position of _internal_ block of text as iterator
+ // into parser's source string (see wxHtmlParser::GetSource())
// See explanation (returned value is marked with *):
// bla bla bla