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 6c20b336b0740958958793a4f57c63fa8ebfabf1..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"
@@ -37,19 +37,19 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
         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()));
            }