1. wxMenu{Item|Bar} modifications for wxMotif

[wxWidgets.git] / src / html / m_pre.cpp

diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index 25e24cf402e34c440050131f63d0d09350cb4632..98d6d8581ff62393b2c5f0ba71aeb163f334474a 100644 (file)
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -13,6 +13,7 @@
 
 #include <wx/wxprec.h>
 
 
 #include <wx/wxprec.h>
 

+#include "wx/defs.h"

 #if wxUSE_HTML
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #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;
     m_Width = m_Height = 0;
 
     i = 0;

-#if (wxVERSION_NUMBER < 2100)
-    while (tokenizer.HasMoreToken()) {
-#else

     while (tokenizer.HasMoreTokens()) {
     while (tokenizer.HasMoreTokens()) {

-#endif

         if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
         tmp = tokenizer.NextToken();
         tmp.Replace("&nbsp;", " ", TRUE);
         if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
         tmp = tokenizer.NextToken();
         tmp.Replace("&nbsp;", " ", TRUE);


@@ -128,8 +125,8 @@ TAG_HANDLER_BEGIN(PRE, "PRE")
 
         m_WParser -> CloseContainer();
         c = m_WParser -> OpenContainer();
 
         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);
 
         m_WParser -> SetFontUnderlined(FALSE);
         m_WParser -> SetFontBold(FALSE);