m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
m_FontSize = 3; //default one
CreateCurrentFont(); // we're selecting default font into
-
+
// we're not using GetCharWidth/Height() because of
// differences under X and win
wxCoord w,h;
return GetFS()->OpenFile(myurl, flags);
}
+#define NBSP_UNICODE_VALUE (wxChar(160))
+#if !wxUSE_UNICODE
+ #define CUR_NBSP_VALUE m_nbsp
+#else
+ #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
+#endif
+
void wxHtmlWinParser::AddText(const wxString& txt)
{
- #define NBSP_UNICODE_VALUE (wxChar(160))
#if !wxUSE_UNICODE
if ( m_nbsp == 0 )
m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
- #define CUR_NBSP_VALUE m_nbsp
-#else
- #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
#endif
if ( m_whitespaceMode == Whitespace_Normal )
while (i < end)
{
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')))
{
++i, ++x;
++i;
}
- if (d == CUR_NBSP_VALUE)
- d = ' ';
-
- temp[templen++] = d;
-
if (x)
{
temp[templen-1] = wxT(' ');
{
buf[len] = 0;
+ for ( int i = 0; i < len; i++ )
+ {
+ if ( buf[i] == CUR_NBSP_VALUE )
+ buf[i] = ' ';
+ }
+
#if !wxUSE_UNICODE
if (m_EncConv)
m_EncConv->Convert(buf);
const wxString::const_iterator end = text.end();
wxString::const_iterator copyFrom = text.begin();
- size_t posFrom = 0;
size_t pos = 0;
int posColumn = m_posColumn;
for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos )
posColumn += expandTo;
copyFrom = i + 1;
- posFrom = pos + 1;
}
else
{