X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..e1ee679c2e3f48bc4f2607e35033ed5505ed6665:/src/html/m_layout.cpp

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index c34aa54868..4fd163e68b 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -10,15 +10,17 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
+
+#include "wx/defs.h"
 #if wxUSE_HTML
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 
@@ -38,7 +40,7 @@ TAG_HANDLER_BEGIN(P, "P")
             m_WParser -> CloseContainer();
             m_WParser -> OpenContainer();
     }
-        m_WParser -> GetContainer() -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_TOP);
+        m_WParser -> GetContainer() -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser -> GetContainer() -> SetAlign(tag);
         return FALSE;
     }
@@ -72,13 +74,13 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
         int old = m_WParser -> GetAlign();
         wxHtmlContainerCell *c = m_WParser -> GetContainer();
 
-        m_WParser -> SetAlign(HTML_ALIGN_CENTER);
+        m_WParser -> SetAlign(wxHTML_ALIGN_CENTER);
         if (c -> GetFirstCell() != NULL) {
             m_WParser -> CloseContainer();
             m_WParser -> OpenContainer();
         }
         else
-            c -> SetAlignHor(HTML_ALIGN_CENTER);
+            c -> SetAlignHor(wxHTML_ALIGN_CENTER);
 
         if (tag.HasEnding()) {
             ParseInner(tag);
@@ -183,7 +185,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         if (tag.HasParam("BGCOLOR")) {
             if (tag.ScanParam("BGCOLOR", "#%lX", &tmp) == 1) {
                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
-                m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr, HTML_CLR_BACKGROUND));
+                m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
                 if (m_WParser -> GetWindow() != NULL)
                     m_WParser -> GetWindow() -> SetBackgroundColour(clr);
 	    }
@@ -203,15 +205,15 @@ TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
     
         m_WParser -> CloseContainer();
         c = m_WParser -> OpenContainer();
-        if (c -> GetAlignHor() == HTML_ALIGN_RIGHT)
-            c -> SetIndent(5 * m_WParser -> GetCharWidth(), HTML_INDENT_RIGHT);
+        if (c -> GetAlignHor() == wxHTML_ALIGN_RIGHT)
+            c -> SetIndent(5 * m_WParser -> GetCharWidth(), wxHTML_INDENT_RIGHT);
         else
-            c -> SetIndent(5 * m_WParser -> GetCharWidth(), HTML_INDENT_LEFT);
-        c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_TOP);
+            c -> SetIndent(5 * m_WParser -> GetCharWidth(), wxHTML_INDENT_LEFT);
+        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser -> OpenContainer();
         ParseInner(tag);
         c = m_WParser -> CloseContainer();
-        c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_BOTTOM);
+        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_BOTTOM);
         m_WParser -> CloseContainer();
         m_WParser -> OpenContainer();
         return TRUE;