X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/903506828b7d042350eae97b5014a63ffca17ef5..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/html/htmltag.h diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 758e1d3a0e..f09efd74b1 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(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) @@ -142,6 +145,8 @@ private: wxHtmlTag *m_Prev; wxHtmlTag *m_FirstChild, *m_LastChild; wxHtmlTag *m_Parent; + + DECLARE_NO_COPY_CLASS(wxHtmlTag) };