From 12909796a5020e917b3e6403cec148717009723f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 3 Nov 1999 22:39:51 +0000 Subject: [PATCH] wxHTML now supports not only " "-like specials but "  " as well git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlcell.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 04570b4127..b9139ae9e8 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -73,11 +73,19 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak) wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell() { m_Word = word; + m_Word.Replace(wxT(" "), wxT(" "), TRUE); m_Word.Replace(wxT("""), wxT("\""), TRUE); m_Word.Replace(wxT("<"), wxT("<"), TRUE); m_Word.Replace(wxT(">"), wxT(">"), TRUE); m_Word.Replace(wxT("&"), wxT("&"), TRUE); + + m_Word.Replace(wxT("  "), wxT(" "), TRUE); + m_Word.Replace(wxT("" "), wxT("\""), TRUE); + m_Word.Replace(wxT("< "), wxT("<"), TRUE); + m_Word.Replace(wxT("> "), wxT(">"), TRUE); + m_Word.Replace(wxT("& "), wxT("&"), TRUE); + dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent); SetCanLiveOnPagebreak(FALSE); }