Finished the changes necessary to use the new event system.

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

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 161cbd450c051b1f15b98f741738bbef855a827a..b183ffaa33caaff53ce519b08b939ed809bc5917 100644 (file)
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -14,7 +14,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 
 #ifdef __BORDLANDC__
 #pragma hdrstop


@@ -39,34 +39,40 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        wxColour oldclr = m_WParser -> GetActualColor();
-        int oldsize = m_WParser -> GetFontSize();
-        wxString oldface = m_WParser -> GetFontFace();
+        wxColour oldclr = m_WParser->GetActualColor();
+        int oldsize = m_WParser->GetFontSize();
+        wxString oldface = m_WParser->GetFontFace();

 
 

-        if (tag.HasParam(wxT("COLOR"))) {
+        if (tag.HasParam(wxT("COLOR"))) 
+           {

             unsigned long tmp = 0; 
             wxColour clr;
             unsigned long tmp = 0; 
             wxColour clr;

-            if (tag.ScanParam(wxT("COLOR"), wxT("#%lX"), &tmp) == 1) {
+            if (tag.ScanParam(wxT("COLOR"), wxT("#%lX"), &tmp) == 1) 
+               {

                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
                 clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));

-                m_WParser -> SetActualColor(clr);
-                m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr));
+                m_WParser->SetActualColor(clr);
+                m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr));

             }
         }
 
             }
         }
 

-        if (tag.HasParam(wxT("SIZE"))) {
+        if (tag.HasParam(wxT("SIZE"))) 
+           {

             long tmp = 0;
             wxChar c = tag.GetParam(wxT("SIZE"))[(unsigned int) 0];
             long tmp = 0;
             wxChar c = tag.GetParam(wxT("SIZE"))[(unsigned int) 0];

-            if (tag.ScanParam(wxT("SIZE"), wxT("%li"), &tmp) == 1) {
+            if (tag.ScanParam(wxT("SIZE"), wxT("%li"), &tmp) == 1) 
+               {

                 if (c == '+' || c == '-')
                 if (c == '+' || c == '-')

-                    m_WParser -> SetFontSize(oldsize+tmp);
+                    m_WParser->SetFontSize(oldsize+tmp);

                 else
                 else

-                    m_WParser -> SetFontSize(tmp);
-                m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+                    m_WParser->SetFontSize(tmp);
+                m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

             }
         }
         
             }
         }
         

-        if (tag.HasParam(wxT("FACE"))) {
-            if (m_Faces.GetCount() == 0) {
+        if (tag.HasParam(wxT("FACE"))) 
+           {
+            if (m_Faces.GetCount() == 0) 
+               {

                 wxFontEnumerator enu;
                 enu.EnumerateFacenames();
                 m_Faces = *enu.GetFacenames();
                 wxFontEnumerator enu;
                 enu.EnumerateFacenames();
                 m_Faces = *enu.GetFacenames();


@@ -75,26 +81,32 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
             int index;
             
             while (tk.HasMoreTokens()) 
             int index;
             
             while (tk.HasMoreTokens()) 

-                if ((index = m_Faces.Index(tk.GetNextToken())) != wxNOT_FOUND) {
-                    m_WParser -> SetFontFace(m_Faces[index]);
-                    m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+               {
+                if ((index = m_Faces.Index(tk.GetNextToken())) != wxNOT_FOUND) 
+                       {
+                    m_WParser->SetFontFace(m_Faces[index]);
+                    m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

                     break;
                 }
                     break;
                 }

+               }

         }
 
         ParseInner(tag);
 
         }
 
         ParseInner(tag);
 

-        if (oldface != m_WParser -> GetFontFace()) {
-            m_WParser -> SetFontFace(oldface);
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        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 (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));
+        if (oldclr != m_WParser->GetActualColor()) 
+           {
+            m_WParser->SetActualColor(oldclr);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));

         }
         return TRUE;
     }
         }
         return TRUE;
     }


@@ -106,15 +118,15 @@ TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int underlined = m_WParser -> GetFontUnderlined();
+        int underlined = m_WParser->GetFontUnderlined();

 
 

-        m_WParser -> SetFontUnderlined(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontUnderlined(TRUE);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontUnderlined(underlined);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontUnderlined(underlined);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

         return TRUE;
     }
 
         return TRUE;
     }
 


@@ -127,15 +139,15 @@ TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int bold = m_WParser -> GetFontBold();
+        int bold = m_WParser->GetFontBold();

 
 

-        m_WParser -> SetFontBold(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontBold(TRUE);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontBold(bold);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontBold(bold);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

         return TRUE;
     }
 
         return TRUE;
     }
 


@@ -148,15 +160,15 @@ TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int italic = m_WParser -> GetFontItalic();
+        int italic = m_WParser->GetFontItalic();

 
 

-        m_WParser -> SetFontItalic(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontItalic(TRUE);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontItalic(italic);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontItalic(italic);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

         return TRUE;
     }
 
         return TRUE;
     }
 


@@ -169,15 +181,15 @@ TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int fixed = m_WParser -> GetFontFixed();
+        int fixed = m_WParser->GetFontFixed();

 
 

-        m_WParser -> SetFontFixed(TRUE);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontFixed(TRUE);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontFixed(fixed);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontFixed(fixed);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

         return TRUE;
     }
 
         return TRUE;
     }
 


@@ -194,64 +206,67 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
         int old_size, old_b, old_i, old_u, old_f, old_al;
         wxHtmlContainerCell *c;
 
         int old_size, old_b, old_i, old_u, old_f, old_al;
         wxHtmlContainerCell *c;
 

-        old_size = m_WParser -> GetFontSize();
-        old_b = m_WParser -> GetFontBold();
-        old_i = m_WParser -> GetFontItalic();
-        old_u = m_WParser -> GetFontUnderlined();
-        old_f = m_WParser -> GetFontFixed();
-        old_al = m_WParser -> GetAlign();
+        old_size = m_WParser->GetFontSize();
+        old_b = m_WParser->GetFontBold();
+        old_i = m_WParser->GetFontItalic();
+        old_u = m_WParser->GetFontUnderlined();
+        old_f = m_WParser->GetFontFixed();
+        old_al = m_WParser->GetAlign();

 
 

-        m_WParser -> SetFontBold(TRUE);
-        m_WParser -> SetFontItalic(FALSE);
-        m_WParser -> SetFontUnderlined(FALSE);
-        m_WParser -> SetFontFixed(FALSE);
+        m_WParser->SetFontBold(TRUE);
+        m_WParser->SetFontItalic(FALSE);
+        m_WParser->SetFontUnderlined(FALSE);
+        m_WParser->SetFontFixed(FALSE);

 
         if (tag.GetName() == wxT("H1"))
 
         if (tag.GetName() == wxT("H1"))

-                m_WParser -> SetFontSize(7);
+                m_WParser->SetFontSize(7);

         else if (tag.GetName() == wxT("H2"))
         else if (tag.GetName() == wxT("H2"))

-                m_WParser -> SetFontSize(6);
+                m_WParser->SetFontSize(6);

         else if (tag.GetName() == wxT("H3"))
         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);
+                m_WParser->SetFontSize(5);
+        else if (tag.GetName() == wxT("H4")) 
+           {
+                m_WParser->SetFontSize(5);
+                m_WParser->SetFontItalic(TRUE);
+                m_WParser->SetFontBold(FALSE);

         }
         else if (tag.GetName() == wxT("H5"))
         }
         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);
+                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()) {
-            m_WParser -> CloseContainer();
-            m_WParser -> OpenContainer();
-            c = m_WParser -> GetContainer();
+        c = m_WParser->GetContainer();
+        if (c->GetFirstCell()) 
+           {
+            m_WParser->CloseContainer();
+            m_WParser->OpenContainer();
+            c = m_WParser->GetContainer();

         }
         }

-        c = m_WParser -> GetContainer();
+        c = m_WParser->GetContainer();

 
 

-        c -> SetAlign(tag);
-        c -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
-        m_WParser -> SetAlign(c -> GetAlignHor());
+        c->SetAlign(tag);
+        c->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
+        m_WParser->SetAlign(c->GetAlignHor());

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontSize(old_size);
-        m_WParser -> SetFontBold(old_b);
-        m_WParser -> SetFontItalic(old_i);
-        m_WParser -> SetFontUnderlined(old_u);
-        m_WParser -> SetFontFixed(old_f);
-        m_WParser -> SetAlign(old_al);
+        m_WParser->SetFontSize(old_size);
+        m_WParser->SetFontBold(old_b);
+        m_WParser->SetFontItalic(old_i);
+        m_WParser->SetFontUnderlined(old_u);
+        m_WParser->SetFontFixed(old_f);
+        m_WParser->SetAlign(old_al);

 
 

-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-        m_WParser -> CloseContainer();
-        m_WParser -> OpenContainer();
-        c = m_WParser -> GetContainer();
-        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+        m_WParser->CloseContainer();
+        m_WParser->OpenContainer();
+        c = m_WParser->GetContainer();
+        c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);

 
         return TRUE;
     }
 
         return TRUE;
     }


@@ -263,16 +278,16 @@ TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        int oldsize = m_WParser -> GetFontSize();
+        int oldsize = m_WParser->GetFontSize();

         int sz = (tag.GetName() == wxT("BIG")) ? +1 : -1;
 
         int sz = (tag.GetName() == wxT("BIG")) ? +1 : -1;
 

-        m_WParser -> SetFontSize(sz);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontSize(sz);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

 
         ParseInner(tag);
 
 
         ParseInner(tag);
 

-        m_WParser -> SetFontSize(oldsize);
-        m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
+        m_WParser->SetFontSize(oldsize);
+        m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));

         return TRUE;
     }
 
         return TRUE;
     }