X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c62a62bf732e57dfb39f303f61d92bcc6b404f0..5b36366c59ea68056ba07a3ca1c2cd6022a59735:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 981f2374e5..f681056d58 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -11,7 +11,7 @@ #ifndef _WX_HTMLTAG_H_ #define _WX_HTMLTAG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #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) @@ -107,7 +110,7 @@ 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; @@ -142,6 +145,8 @@ private: wxHtmlTag *m_Prev; wxHtmlTag *m_FirstChild, *m_LastChild; wxHtmlTag *m_Parent; + + DECLARE_NO_COPY_CLASS(wxHtmlTag) };