X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c62a62bf732e57dfb39f303f61d92bcc6b404f0..3a5910cbe95603698b984cc6d8d41bbe7e2f89d9:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 981f2374e5..7c86431ef7 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -4,14 +4,14 @@ // 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_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "htmltag.h" #endif @@ -20,9 +20,10 @@ #if wxUSE_HTML #include "wx/object.h" +#include "wx/arrstr.h" -class WXDLLEXPORT wxColour; -class WXDLLEXPORT wxHtmlEntitiesParser; +class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_HTML wxHtmlEntitiesParser; //----------------------------------------------------------------------------- // wxHtmlTagsCache @@ -31,7 +32,7 @@ class WXDLLEXPORT wxHtmlEntitiesParser; struct wxHtmlCacheItem; -class WXDLLEXPORT wxHtmlTagsCache : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTagsCache : public wxObject { DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache) @@ -47,6 +48,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,7 +59,7 @@ public: // by wxHtmlParser. //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlTag : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTag : public wxObject { DECLARE_CLASS(wxHtmlTag) @@ -84,17 +87,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_commas == true)
+ wxString GetParam(const wxString& par, bool with_commas = false) const;
// Convenience functions:
bool GetParamAsColour(const wxString& par, wxColour *clr) const;
@@ -102,23 +105,23 @@ 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_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.
wxString GetAllParams() const;
#if WXWIN_COMPATIBILITY_2_2
- // return TRUE if this is ending tag () or FALSE
+ // return true if this is ending tag () or false
// if it isn't (