X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c44a49b85215955e41efbb4c51c998367cb18896..d929eddf3a3dbb04f37624d255f4e24e07595ca1:/include/wx/html/winpars.h diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index ebc4bc1f6e..562a9dd37d 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: winpars.h +// Name: wx/html/winpars.h // Purpose: wxHtmlWinParser class (parser to be used with wxHtmlWindow) // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -107,6 +107,8 @@ public: int GetFontSize() const {return m_FontSize;} void SetFontSize(int s); + // Try to map a font size in points to the HTML 1-7 font size range. + void SetFontPointSize(int pt); int GetFontBold() const {return m_FontBold;} void SetFontBold(int x) {m_FontBold = x;} int GetFontItalic() const {return m_FontItalic;} @@ -130,12 +132,21 @@ public: void SetLinkColor(const wxColour& clr) { m_LinkColor = clr; } const wxColour& GetActualColor() const { return m_ActualColor; } void SetActualColor(const wxColour& clr) { m_ActualColor = clr ;} + const wxColour& GetActualBackgroundColor() const { return m_ActualBackgroundColor; } + void SetActualBackgroundColor(const wxColour& clr) { m_ActualBackgroundColor = clr;} + int GetActualBackgroundMode() const { return m_ActualBackgroundMode; } + void SetActualBackgroundMode(int mode) { m_ActualBackgroundMode = mode;} const wxHtmlLinkInfo& GetLink() const { return m_Link; } void SetLink(const wxHtmlLinkInfo& link); // applies current parser state (link, sub/supscript, ...) to given cell void ApplyStateToCell(wxHtmlCell *cell); + // Needs to be called after inserting a cell that interrupts the flow of + // the text like e.g. and tells us to not consider any of the + // following space as being part of the same space run as before. + void StopCollapsingSpaces() { m_tmpLastWasSpace = false; } + #if !wxUSE_UNICODE void SetInputEncoding(wxFontEncoding enc); wxFontEncoding GetInputEncoding() const { return m_InputEnc; } @@ -183,9 +194,11 @@ private: // 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_FontSize; /* -2 to +4, 0 is default */ + int m_FontSize; // From 1 (smallest) to 7, default is 3. wxColour m_LinkColor; wxColour m_ActualColor; + wxColour m_ActualBackgroundColor; + int m_ActualBackgroundMode; // basic font parameters. wxHtmlLinkInfo m_Link; // actual hypertext link or empty string @@ -246,6 +259,8 @@ private: // the wxHtmlWinParser object //----------------------------------------------------------------------------- +class WXDLLIMPEXP_FWD_HTML wxHtmlStyleParams; + class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler { DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler) @@ -254,10 +269,13 @@ public: wxHtmlWinTagHandler() : wxHtmlTagHandler() {} virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} + virtual wxHtmlWinParser* GetParser() const { return (wxHtmlWinParser*)m_Parser; } protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted + void ApplyStyle(const wxHtmlStyleParams &styleParams); + wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler); };