X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..9874b4ee8308b8989c5df7db4f3559625299d0a4:/src/html/m_pre.cpp diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp index 25e24cf402..98d6d8581f 100644 --- a/src/html/m_pre.cpp +++ b/src/html/m_pre.cpp @@ -13,6 +13,7 @@ #include +#include "wx/defs.h" #if wxUSE_HTML #ifdef __BORDLANDC__ #pragma hdrstop @@ -66,11 +67,7 @@ wxHtmlPRECell::wxHtmlPRECell(const wxString& s, wxDC& dc) : wxHtmlCell() m_Width = m_Height = 0; i = 0; -#if (wxVERSION_NUMBER < 2100) - while (tokenizer.HasMoreToken()) { -#else while (tokenizer.HasMoreTokens()) { -#endif if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10)); tmp = tokenizer.NextToken(); tmp.Replace(" ", " ", TRUE); @@ -128,8 +125,8 @@ TAG_HANDLER_BEGIN(PRE, "PRE") m_WParser -> CloseContainer(); c = m_WParser -> OpenContainer(); - c -> SetAlignHor(HTML_ALIGN_LEFT); - c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_VERTICAL); + c -> SetAlignHor(wxHTML_ALIGN_LEFT); + c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_VERTICAL); m_WParser -> SetFontUnderlined(FALSE); m_WParser -> SetFontBold(FALSE);