Catching up to latest thread changes

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

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 1718aa01e791a5b8401d7eb9edf5c96ba845350e..afc454bc80fc6b7783eb4d9edca788b393360f32 100644 (file)
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -11,7 +11,7 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #if wxUSE_HTML
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 #include "wx/html/forcelnk.h"
@@ -30,26 +30,26 @@
 FORCE_LINK_ME(mod_fonts)
 
 
-TAG_HANDLER_BEGIN(FONT, "FONT(")
+TAG_HANDLER_BEGIN(FONT, "FONT")
 
     TAG_HANDLER_PROC(tag)
     {
         wxColour oldclr = m_WParser -> GetActualColor();
         int oldsize = m_WParser -> GetFontSize();
 
-        if (tag.HasParam("COLOR")) {
+        if (tag.HasParam(wxT("COLOR"))) {
            unsigned long tmp = 0; 
             wxColour clr;
-            if (tag.ScanParam("COLOR", "#%lX", &tmp) == 1) {
+            if (tag.ScanParam(wxT("COLOR"), wxT("#%lX"), &tmp) == 1) {
                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
                 m_WParser -> SetActualColor(clr);
                 m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr));
            }
         }
 
-        if (tag.HasParam("SIZE")) {
+        if (tag.HasParam(wxT("SIZE"))) {
            long tmp = 0;
-            if (tag.ScanParam("SIZE", "%li", &tmp) == 1) {
+            if (tag.ScanParam(wxT("SIZE"), wxT("%li"), &tmp) == 1) {
                 m_WParser -> SetFontSize(oldsize+tmp);
                 m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
            }
@@ -71,7 +71,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT(")
 TAG_HANDLER_END(FONT)
 
 
-TAG_HANDLER_BEGIN(FACES, "U,I,B,TT(")
+TAG_HANDLER_BEGIN(FACES, "U,I,B,TT")
 
     TAG_HANDLER_PROC(tag)
     {
@@ -154,7 +154,7 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
 
         c -> SetAlign(tag);
         c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_TOP);
+        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser -> SetAlign(c -> GetAlignHor());
 
         ParseInner(tag);
@@ -170,7 +170,7 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
         m_WParser -> CloseContainer();
         m_WParser -> OpenContainer();
         c = m_WParser -> GetContainer();
-        c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_TOP);
+        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
 
         return TRUE;
     }