X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968d6f46c8d3eb82ae00fdcf338b2f7990bf2a48..c3c62822fdda9d340179dec663a806e905882cc9:/include/wx/html/winpars.h diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index f173ec1ba9..8f554ce8c2 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -19,11 +19,11 @@ #include "wx/html/htmlcell.h" #include "wx/encconv.h" -class WXDLLIMPEXP_HTML wxHtmlWindow; -class WXDLLIMPEXP_HTML wxHtmlWindowInterface; -class WXDLLIMPEXP_HTML wxHtmlWinParser; -class WXDLLIMPEXP_HTML wxHtmlWinTagHandler; -class WXDLLIMPEXP_HTML wxHtmlTagsModule; +class WXDLLIMPEXP_FWD_HTML wxHtmlWindow; +class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface; +class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser; +class WXDLLIMPEXP_FWD_HTML wxHtmlWinTagHandler; +class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule; //-------------------------------------------------------------------------------- @@ -41,7 +41,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser public: wxHtmlWinParser(wxHtmlWindowInterface *wndIface = NULL); - ~wxHtmlWinParser(); + virtual ~wxHtmlWinParser(); virtual void InitParser(const wxString& source); virtual void DoneParser(); @@ -146,10 +146,10 @@ public: virtual wxFont* CreateCurrentFont(); protected: - virtual void AddText(const wxChar* txt); + virtual void AddText(const wxString& txt); private: - void DoAddText(wxChar *temp, int& templen, wxChar nbsp); + void DoAddText(wxChar *temp, int& templen); bool m_tmpLastWasSpace; wxChar *m_tmpStrBuf; @@ -201,6 +201,7 @@ private: // html font sizes and faces of fixed and proportional fonts #if !wxUSE_UNICODE + wxChar m_nbsp; wxFontEncoding m_InputEnc, m_OutputEnc; // I/O font encodings wxEncodingConverter *m_EncConv; @@ -230,7 +231,7 @@ class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler public: wxHtmlWinTagHandler() : wxHtmlTagHandler() {} - virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}; + virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;} protected: wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted