fix handling Alt-key events in wxComboBox

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

diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 61e59f86c3c9c9339da99c3dc0c0e86076345e3c..ebcbe2625ad7a2d0d8a66ec3dd432db5ea958fed 100644 (file)
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -16,7 +16,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -31,10 +31,12 @@
 FORCE_LINK_ME(m_fonts)
 
 
 FORCE_LINK_ME(m_fonts)
 
 

-TAG_HANDLER_BEGIN(FONT, "FONT")
+TAG_HANDLER_BEGIN(FONT, "FONT" )

 
     TAG_HANDLER_VARS
 
     TAG_HANDLER_VARS

-        wxSortedArrayString m_Faces;
+        wxArrayString m_Faces;
+
+    TAG_HANDLER_CONSTR(FONT) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -73,14 +75,16 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
             {
                 wxFontEnumerator enu;
                 enu.EnumerateFacenames();
             {
                 wxFontEnumerator enu;
                 enu.EnumerateFacenames();

-                m_Faces = *enu.GetFacenames();
+                const wxArrayString *faces = enu.GetFacenames();
+                if ( faces )
+                    m_Faces = *faces;

             }
             wxStringTokenizer tk(tag.GetParam(wxT("FACE")), wxT(","));
             int index;
 
             while (tk.HasMoreTokens())
             {
             }
             wxStringTokenizer tk(tag.GetParam(wxT("FACE")), wxT(","));
             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()));
                 {
                     m_WParser->SetFontFace(m_Faces[index]);
                     m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));


@@ -106,7 +110,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
             m_WParser->SetActualColor(oldclr);
             m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
         }
             m_WParser->SetActualColor(oldclr);
             m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
         }

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(FONT)
     }
 
 TAG_HANDLER_END(FONT)


@@ -114,11 +118,13 @@ TAG_HANDLER_END(FONT)
 
 TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
 
 
 TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
 

+    TAG_HANDLER_CONSTR(FACES_U) { }
+

     TAG_HANDLER_PROC(tag)
     {
         int underlined = m_WParser->GetFontUnderlined();
 
     TAG_HANDLER_PROC(tag)
     {
         int underlined = m_WParser->GetFontUnderlined();
 

-        m_WParser->SetFontUnderlined(TRUE);
+        m_WParser->SetFontUnderlined(true);

         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 
         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 


@@ -127,7 +133,7 @@ TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
         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;

     }
 
 TAG_HANDLER_END(FACES_U)
     }
 
 TAG_HANDLER_END(FACES_U)


@@ -136,12 +142,13 @@ TAG_HANDLER_END(FACES_U)
 
 
 TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
 
 
 TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")

+    TAG_HANDLER_CONSTR(FACES_B) { }

 
     TAG_HANDLER_PROC(tag)
     {
         int bold = m_WParser->GetFontBold();
 
 
     TAG_HANDLER_PROC(tag)
     {
         int bold = m_WParser->GetFontBold();
 

-        m_WParser->SetFontBold(TRUE);
+        m_WParser->SetFontBold(true);

         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 
         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 


@@ -150,7 +157,7 @@ TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
         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;

     }
 
 TAG_HANDLER_END(FACES_B)
     }
 
 TAG_HANDLER_END(FACES_B)


@@ -159,12 +166,13 @@ TAG_HANDLER_END(FACES_B)
 
 
 TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
 
 
 TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")

+    TAG_HANDLER_CONSTR(FACES_I) { }

 
     TAG_HANDLER_PROC(tag)
     {
         int italic = m_WParser->GetFontItalic();
 
 
     TAG_HANDLER_PROC(tag)
     {
         int italic = m_WParser->GetFontItalic();
 

-        m_WParser->SetFontItalic(TRUE);
+        m_WParser->SetFontItalic(true);

         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 
         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 


@@ -173,7 +181,7 @@ TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
         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;

     }
 
 TAG_HANDLER_END(FACES_I)
     }
 
 TAG_HANDLER_END(FACES_I)


@@ -182,12 +190,13 @@ TAG_HANDLER_END(FACES_I)
 
 
 TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
 
 
 TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")

+    TAG_HANDLER_CONSTR(FACES_TT) { }

 
     TAG_HANDLER_PROC(tag)
     {
         int fixed = m_WParser->GetFontFixed();
 
 
     TAG_HANDLER_PROC(tag)
     {
         int fixed = m_WParser->GetFontFixed();
 

-        m_WParser->SetFontFixed(TRUE);
+        m_WParser->SetFontFixed(true);

         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 
         m_WParser->GetContainer()->InsertCell(
             new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
 


@@ -196,7 +205,7 @@ TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
         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;

     }
 
 TAG_HANDLER_END(FACES_TT)
     }
 
 TAG_HANDLER_END(FACES_TT)


@@ -206,6 +215,7 @@ TAG_HANDLER_END(FACES_TT)
 
 
 TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
 
 
 TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")

+    TAG_HANDLER_CONSTR(Hx) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -219,10 +229,10 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
         old_f = m_WParser->GetFontFixed();
         old_al = m_WParser->GetAlign();
 
         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"))
                 m_WParser->SetFontSize(7);
 
         if (tag.GetName() == wxT("H1"))
                 m_WParser->SetFontSize(7);


@@ -233,20 +243,20 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
         else if (tag.GetName() == wxT("H4"))
         {
                 m_WParser->SetFontSize(5);
         else if (tag.GetName() == wxT("H4"))
         {
                 m_WParser->SetFontSize(5);

-                m_WParser->SetFontItalic(TRUE);
-                m_WParser->SetFontBold(FALSE);
+                m_WParser->SetFontItalic(true);
+                m_WParser->SetFontBold(false);

         }
         else if (tag.GetName() == wxT("H5"))
                 m_WParser->SetFontSize(4);
         else if (tag.GetName() == wxT("H6"))
         {
                 m_WParser->SetFontSize(4);
         }
         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->SetFontItalic(true);
+                m_WParser->SetFontBold(false);

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

-        if (c->GetFirstCell())
+        if (c->GetFirstChild())

         {
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
         {
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();


@@ -275,13 +285,14 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
         c = m_WParser->GetContainer();
         c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
 
         c = m_WParser->GetContainer();
         c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
 

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(Hx)
 
 
 TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
     }
 
 TAG_HANDLER_END(Hx)
 
 
 TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")

+    TAG_HANDLER_CONSTR(BIGSMALL) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -297,7 +308,7 @@ TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
         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;

     }
 
 TAG_HANDLER_END(BIGSMALL)
     }
 
 TAG_HANDLER_END(BIGSMALL)