X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 0dc91747ed..40bcf48871 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -4,49 +4,50 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef _WX_HTMLTAG_H_ #define _WX_HTMLTAG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "htmltag.h" -#endif - #include "wx/defs.h" #if wxUSE_HTML #include "wx/object.h" +#include "wx/arrstr.h" -class WXDLLEXPORT wxColour; -class WXDLLEXPORT wxHtmlEntitiesParser; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser; //----------------------------------------------------------------------------- // wxHtmlTagsCache // - internal wxHTML class, do not use! //----------------------------------------------------------------------------- -struct wxHtmlCacheItem; +class wxHtmlTagsCacheData; -class WXDLLEXPORT 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); - ~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) }; @@ -56,16 +57,16 @@ public: // by wxHtmlParser. //-------------------------------------------------------------------------------- -class WXDLLEXPORT 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; @@ -84,17 +85,17 @@ public: // Returns tag's name in uppercase. inline wxString GetName() const {return m_Name;} - // Returns TRUE if the tag has given parameter. Parameter + // Returns true if the tag has given parameter. Parameter // should always be in uppercase. - // Example : HasParam("SRC") returns TRUE + // Example : HasParam("SRC") returns true bool HasParam(const wxString& par) const; // Returns value of the param. Value is in uppercase unless it is // 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;
@@ -102,53 +103,73 @@ 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
// *one* parameter !
- int ScanParam(const wxString& par, const wxChar *format, void *param) const;
+ int ScanParam(const wxString& par, const char *format, void *param) const;
+ int ScanParam(const wxString& par, const wchar_t *format, void *param) const;
// Returns string containing all params.
wxString GetAllParams() const;
-#if WXWIN_COMPATIBILITY_2_2
- // return TRUE if this is ending tag () or FALSE
- // if it isn't (