X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bd72d9065d076d720a57fdd319f967ecf4e5652..56b9925b116dfa58028fccb2556852f2da2ab9ac:/src/html/m_fonts.cpp

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index d5391350e6..f9637a2d50 100644
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation
 #endif
 
@@ -16,12 +16,11 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
 #endif
 
 #include "wx/html/forcelnk.h"
@@ -32,10 +31,12 @@
 FORCE_LINK_ME(m_fonts)
 
 
-TAG_HANDLER_BEGIN(FONT, "FONT")
+TAG_HANDLER_BEGIN(FONT, "FONT" )
 
     TAG_HANDLER_VARS
-        wxSortedArrayString m_Faces;
+        wxArrayString m_Faces;
+
+    TAG_HANDLER_CONSTR(FONT) { }
 
     TAG_HANDLER_PROC(tag)
     {
@@ -44,21 +45,21 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
         wxString oldface = m_WParser->GetFontFace();
 
         if (tag.HasParam(wxT("COLOR")))
-	    {
+        {
             wxColour clr;
             if (tag.GetParamAsColour(wxT("COLOR"), &clr))
-	        {
+            {
                 m_WParser->SetActualColor(clr);
                 m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr));
             }
         }
 
         if (tag.HasParam(wxT("SIZE")))
-	    {
+        {
             int tmp = 0;
             wxChar c = tag.GetParam(wxT("SIZE")).GetChar(0);
             if (tag.GetParamAsInt(wxT("SIZE"), &tmp))
-	        {
+            {
                 if (c == wxT('+') || c == wxT('-'))
                     m_WParser->SetFontSize(oldsize+tmp);
                 else
@@ -69,9 +70,9 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
         }
 
         if (tag.HasParam(wxT("FACE")))
-	    {
+        {
             if (m_Faces.GetCount() == 0)
-	        {
+            {
                 wxFontEnumerator enu;
                 enu.EnumerateFacenames();
                 m_Faces = *enu.GetFacenames();
@@ -80,30 +81,30 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
             int index;
 
             while (tk.HasMoreTokens())
-	        {
-                if ((index = m_Faces.Index(tk.GetNextToken())) != wxNOT_FOUND)
-		        {
+            {
+                if ((index = m_Faces.Index(tk.GetNextToken(), FALSE)) != wxNOT_FOUND)
+                {
                     m_WParser->SetFontFace(m_Faces[index]);
                     m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
                     break;
                 }
-        	}
+            }
         }
 
         ParseInner(tag);
 
         if (oldface != m_WParser->GetFontFace())
-	    {
+        {
             m_WParser->SetFontFace(oldface);
             m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
         }
         if (oldsize != m_WParser->GetFontSize())
-	    {
+        {
             m_WParser->SetFontSize(oldsize);
             m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
         }
         if (oldclr != m_WParser->GetActualColor())
-	    {
+        {
             m_WParser->SetActualColor(oldclr);
             m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
         }
@@ -115,6 +116,8 @@ TAG_HANDLER_END(FONT)
 
 TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
 
+    TAG_HANDLER_CONSTR(FACES_U) { }
+
     TAG_HANDLER_PROC(tag)
     {
         int underlined = m_WParser->GetFontUnderlined();
@@ -137,6 +140,7 @@ TAG_HANDLER_END(FACES_U)
 
 
 TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
+    TAG_HANDLER_CONSTR(FACES_B) { }
 
     TAG_HANDLER_PROC(tag)
     {
@@ -160,6 +164,7 @@ TAG_HANDLER_END(FACES_B)
 
 
 TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
+    TAG_HANDLER_CONSTR(FACES_I) { }
 
     TAG_HANDLER_PROC(tag)
     {
@@ -183,6 +188,7 @@ TAG_HANDLER_END(FACES_I)
 
 
 TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
+    TAG_HANDLER_CONSTR(FACES_TT) { }
 
     TAG_HANDLER_PROC(tag)
     {
@@ -207,6 +213,7 @@ TAG_HANDLER_END(FACES_TT)
 
 
 TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
+    TAG_HANDLER_CONSTR(Hx) { }
 
     TAG_HANDLER_PROC(tag)
     {
@@ -232,7 +239,7 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
         else if (tag.GetName() == wxT("H3"))
                 m_WParser->SetFontSize(5);
         else if (tag.GetName() == wxT("H4"))
-	    {
+        {
                 m_WParser->SetFontSize(5);
                 m_WParser->SetFontItalic(TRUE);
                 m_WParser->SetFontBold(FALSE);
@@ -240,15 +247,15 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
         else if (tag.GetName() == wxT("H5"))
                 m_WParser->SetFontSize(4);
         else if (tag.GetName() == wxT("H6"))
-	    {
+        {
                 m_WParser->SetFontSize(4);
                 m_WParser->SetFontItalic(TRUE);
                 m_WParser->SetFontBold(FALSE);
         }
 
         c = m_WParser->GetContainer();
-        if (c->GetFirstCell())
-	    {
+        if (c->GetFirstChild())
+        {
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
             c = m_WParser->GetContainer();
@@ -283,6 +290,7 @@ TAG_HANDLER_END(Hx)
 
 
 TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
+    TAG_HANDLER_CONSTR(BIGSMALL) { }
 
     TAG_HANDLER_PROC(tag)
     {