X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/html/winpars.h diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index 5e6866d069..196ae84d01 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -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); @@ -117,10 +117,12 @@ public: const wxHtmlLinkInfo& GetLink() const { return m_Link; } void SetLink(const wxHtmlLinkInfo& link); +#if !wxUSE_UNICODE void SetInputEncoding(wxFontEncoding enc); wxFontEncoding GetInputEncoding() const { return m_InputEnc; } wxFontEncoding GetOutputEncoding() const { return m_OutputEnc; } wxEncodingConverter *GetEncodingConverter() const { return m_EncConv; } +#endif // creates font depending on m_Font* members. virtual wxFont* CreateCurrentFont(); @@ -161,7 +163,9 @@ private: wxFont* m_FontsTable[2][2][2][2][7]; wxString m_FontsFacesTable[2][2][2][2][7]; +#if !wxUSE_UNICODE wxFontEncoding m_FontsEncTable[2][2][2][2][7]; +#endif // table of loaded fonts. 1st four indexes are 0 or 1, depending on on/off // state of these flags (from left to right): // [bold][italic][underlined][fixed_size] @@ -172,9 +176,13 @@ private: wxString m_FontFaceFixed, m_FontFaceNormal; // html font sizes and faces of fixed and proportional fonts + DECLARE_NO_COPY_CLASS(wxHtmlWinParser) + +#if !wxUSE_UNICODE wxFontEncoding m_InputEnc, m_OutputEnc; // I/O font encodings wxEncodingConverter *m_EncConv; +#endif }; @@ -200,6 +208,8 @@ public: protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted + + DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler) };