X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..b93907ee8a1894e7424375b6107f24182035b564:/include/wx/html/winpars.h?ds=sidebyside diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index d2dd340230..d1eae9c929 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -24,10 +24,10 @@ #include "wx/html/htmlcell.h" #include "wx/encconv.h" -class WXDLLEXPORT wxHtmlWindow; -class WXDLLEXPORT wxHtmlWinParser; -class WXDLLEXPORT wxHtmlWinTagHandler; -class WXDLLEXPORT wxHtmlTagsModule; +class WXDLLIMPEXP_HTML wxHtmlWindow; +class WXDLLIMPEXP_HTML wxHtmlWinParser; +class WXDLLIMPEXP_HTML wxHtmlWinTagHandler; +class WXDLLIMPEXP_HTML wxHtmlTagsModule; //-------------------------------------------------------------------------------- // wxHtmlWinParser @@ -36,7 +36,7 @@ class WXDLLEXPORT wxHtmlTagsModule; // wxHtmlWindow. It uses special wxHtmlWinTagHandler. //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser +class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser { friend class wxHtmlWindow; @@ -68,8 +68,8 @@ public: // returns associated wxWindow wxHtmlWindow *GetWindow() {return m_Window;} - // sets fonts to be used when displaying HTML page. - void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes); + // Sets fonts to be used when displaying HTML page. (if size null then default sizes used). + void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL); // Adds tags module. see wxHtmlTagsModule for details. static void AddModule(wxHtmlTagsModule *module); @@ -197,7 +197,7 @@ private: // the wxHtmlWinParser object //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlWinTagHandler : public wxHtmlTagHandler +class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler { DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler) @@ -225,7 +225,7 @@ protected: // (See documentation for details) //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlTagsModule : public wxModule +class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule { DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)