X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bd72d9065d076d720a57fdd319f967ecf4e5652..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index b438039cd5..42927905cb 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -11,13 +11,17 @@ #ifndef _WX_HTMLTAG_H_ #define _WX_HTMLTAG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "htmltag.h" #endif #include "wx/defs.h" + #if wxUSE_HTML +#include "wx/object.h" + +class WXDLLEXPORT wxColour; class WXDLLEXPORT wxHtmlEntitiesParser; //----------------------------------------------------------------------------- @@ -43,6 +47,8 @@ public: // Finds parameters for tag starting at at and fills the variables void QueryTag(int at, int* end1, int* end2); + + DECLARE_NO_COPY_CLASS(wxHtmlTagsCache) }; @@ -56,13 +62,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;} @@ -79,7 +98,7 @@ public: // (or ("WhaT.jpg") if with_commas == TRUE) wxString GetParam(const wxString& par, bool with_commas = FALSE) const; - // Convenience functions: + // Convenience functions: bool GetParamAsColour(const wxString& par, wxColour *clr) const; bool GetParamAsInt(const wxString& par, int *clr) const; @@ -90,17 +109,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 () 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 @@ -117,8 +137,15 @@ 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; + + DECLARE_NO_COPY_CLASS(wxHtmlTag) };