Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed   handling in wxHtmlWinParser, broken by TAB-handling changes (bug #1957041)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-05-05 10:52:30 +00:00
parent 0a21bea0dd
commit 5096757411
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/html/winpars.cpp
View File

@@ -345,17 +345,20 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
return GetFS()->OpenFile(myurl, flags); return GetFS()->OpenFile(myurl, flags);
} }
void wxHtmlWinParser::AddText(const wxString& txt) #define NBSP_UNICODE_VALUE (wxChar(160))
{
#define NBSP_UNICODE_VALUE (wxChar(160))
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
if ( m_nbsp == 0 )
m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
#define CUR_NBSP_VALUE m_nbsp #define CUR_NBSP_VALUE m_nbsp
#else #else
#define CUR_NBSP_VALUE NBSP_UNICODE_VALUE #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
#endif #endif
void wxHtmlWinParser::AddText(const wxString& txt)
{
#if !wxUSE_UNICODE
if ( m_nbsp == 0 )
m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
#endif
if ( m_whitespaceMode == Whitespace_Normal ) if ( m_whitespaceMode == Whitespace_Normal )
{ {
int templen = 0; int templen = 0;
@@ -385,7 +388,7 @@ void wxHtmlWinParser::AddText(const wxString& txt)
while (i < end) while (i < end)
{ {
size_t x = 0; size_t x = 0;
wxChar d = *i; const wxChar d = temp[templen++] = *i;
if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t'))) if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
{ {
++i, ++x; ++i, ++x;
@@ -402,11 +405,6 @@ void wxHtmlWinParser::AddText(const wxString& txt)
++i; ++i;
} }
if (d == CUR_NBSP_VALUE)
d = ' ';
temp[templen++] = d;
if (x) if (x)
{ {
temp[templen-1] = wxT(' '); temp[templen-1] = wxT(' ');
@@ -445,6 +443,12 @@ void wxHtmlWinParser::FlushWordBuf(wxChar *buf, int& len)
{ {
buf[len] = 0; buf[len] = 0;
for ( int i = 0; i < len; i++ )
{
if ( buf[i] == CUR_NBSP_VALUE )
buf[i] = ' ';
}
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
if (m_EncConv) if (m_EncConv)
m_EncConv->Convert(buf); m_EncConv->Convert(buf);