X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..2e9760c0ee8b20ea5c85e7cacd016e84957fcebe:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index b24bdc0ec5..e0370b6b12 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -12,56 +12,38 @@ #define _WX_HTMLTAG_H_ #ifdef __GNUG__ -#pragma interface +#pragma interface "htmltag.h" #endif #include "wx/defs.h" #if wxUSE_HTML - -//-------------------------------------------------------------------------------- +//----------------------------------------------------------------------------- // wxHtmlTagsCache -// !! INTERNAL STRUCTURE !! Do not use in your program! -// This structure contains information on positions of tags -// in the string being parsed -//-------------------------------------------------------------------------------- - -typedef struct { - int Key; - // this is "pos" value passed to wxHtmlTag's constructor. - // it is position of '<' character of the tag - int End1, End2; - // end positions for the tag: - // end1 is '<' of ending tag, - // end2 is '>' or both are - // -1 if there is no ending tag for this one... - // or -2 if this is ending tag - char *Name; - // name of this tag - } sCacheItem; +// - internal wxHTML class, do not use! +//----------------------------------------------------------------------------- +struct wxHtmlCacheItem; - -class wxHtmlTagsCache : public wxObject +class WXDLLEXPORT wxHtmlTagsCache : public wxObject { DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache) - private: - sCacheItem *m_Cache; - int m_CacheSize; - int m_CachePos; +private: + wxHtmlCacheItem *m_Cache; + int m_CacheSize; + int m_CachePos; - public: - wxHtmlTagsCache() : wxObject() {m_CacheSize = 0; m_Cache = NULL;} - wxHtmlTagsCache(const wxString& source); - ~wxHtmlTagsCache() {free(m_Cache);} +public: + wxHtmlTagsCache() : wxObject() {m_CacheSize = 0; m_Cache = NULL;} + wxHtmlTagsCache(const wxString& source); + ~wxHtmlTagsCache() {free(m_Cache);} - void QueryTag(int at, int* end1, int* end2); - // Finds parameters for tag starting at at and fills the variables + // Finds parameters for tag starting at at and fills the variables + void QueryTag(int at, int* end1, int* end2); }; - //-------------------------------------------------------------------------------- // wxHtmlTag // This represents single tag. It is used as internal structure @@ -72,63 +54,62 @@ class WXDLLEXPORT wxHtmlTag : public wxObject { DECLARE_CLASS(wxHtmlTag) - public: - wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCache* cache); - // 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) - - inline wxString GetName() const {return m_Name;} - // Returns tag's name in uppercase. - - bool HasParam(const wxString& par) const; - // Returns TRUE if the tag has given parameter. Parameter - // should always be in uppercase. - // Example : HasParam("SRC") returns TRUE - - wxString GetParam(const wxString& par, bool with_commas = FALSE) 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)
-
- int ScanParam(const wxString& par, char *format, void *param) const;
- // Scans param like scanf() functions family do.
- // 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 !
-
- inline const wxString& GetAllParams() const {return m_Params;}
- // Returns string containing all params.
-
- inline bool IsEnding() const {return m_Ending;}
- // return TRUE if this is ending tag () or FALSE
- // if it isn't ( 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;
+
+ // Scans param like scanf() functions family do.
+ // 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;
+
+ // Returns string containing all params.
+ inline const wxString& GetAllParams() const {return m_Params;}
+
+ // return TRUE if this is ending tag (