X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..4ebd02e913086c6ec131deb0d60ae65b01808afe:/include/wx/html/winpars.h?ds=sidebyside diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 24ed74b270..9185b51423 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -72,6 +72,12 @@ public: // 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); + // Sets font sizes to be relative to the given size or the system + // default size; use either specified or default font + void SetStandardFonts(int size = -1, + const wxString& normal_face = wxEmptyString, + const wxString& fixed_face = wxEmptyString); + // Adds tags module. see wxHtmlTagsModule for details. static void AddModule(wxHtmlTagsModule *module); @@ -148,7 +154,7 @@ private: wxHtmlContainerCell *m_Container; // current container. See Open/CloseContainer for details. - int m_FontBold, m_FontItalic, m_FontUnderlined, m_FontFixed; // this is not TRUE,FALSE but 1,0, we need it for indexing + int m_FontBold, m_FontItalic, m_FontUnderlined, m_FontFixed; // this is not true,false but 1,0, we need it for indexing int m_FontSize; /* -2 to +4, 0 is default */ wxColour m_LinkColor; wxColour m_ActualColor; @@ -156,7 +162,7 @@ private: wxHtmlLinkInfo m_Link; // actual hypertext link or empty string bool m_UseLink; - // TRUE if m_Link is not empty + // true if m_Link is not empty long m_CharHeight, m_CharWidth; // average height of normal-sized text int m_Align; @@ -184,7 +190,7 @@ private: #endif wxHtmlWordCell *m_lastWordCell; - + DECLARE_NO_COPY_CLASS(wxHtmlWinParser) }; @@ -205,7 +211,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler) public: - wxHtmlWinTagHandler() : wxHtmlTagHandler() {}; + wxHtmlWinTagHandler() : wxHtmlTagHandler() {} virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}; @@ -233,7 +239,7 @@ class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule) public: - wxHtmlTagsModule() : wxModule() {}; + wxHtmlTagsModule() : wxModule() {} virtual bool OnInit(); virtual void OnExit();