X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47b378bd88260611387af8604a1c8f62355350ab..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/html/winpars.h diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index c5d6f337dd..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; //-------------------------------------------------------------------------------- @@ -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;