X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97e490f8b08a906b7abceefcf86e2e2ff7ce5465..7ea1c917764fb2588fe1aadc75c49ba300f8cb2f:/src/html/m_layout.cpp?ds=sidebyside

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 2477eb76c6..d9d76f6f6f 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -6,9 +6,6 @@
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
 
 #include "wx/wxprec.h"
 
@@ -300,7 +297,7 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
                 wxString title = m_WParser->GetSource()->Mid(
                                         tag.GetBeginPos(),
                                         tag.GetEndPos1()-tag.GetBeginPos());
-#if !wxUSE_UNICODE
+#if !wxUSE_UNICODE && wxUSE_WCHAR_T
                 wxCSConv conv(m_WParser->GetInputEncoding());
                 title = wxString(title.wc_str(conv), wxConvLocal);
 #endif
@@ -344,9 +341,11 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
                 wxInputStream *is = fileBgImage->GetStream();
                 if ( is )
                 {
+#if !defined(__WXMSW__) || wxUSE_WXDIB
                     wxImage image(*is);
                     if ( image.Ok() )
                         m_WParser->GetWindow()->SetBackgroundImage(image);
+#endif                    
                 }
             }
         }
@@ -395,6 +394,42 @@ TAG_HANDLER_END(BLOCKQUOTE)
 
 
 
+TAG_HANDLER_BEGIN(SUBSUP, "SUB,SUP")
+
+    TAG_HANDLER_PROC(tag)
+    {
+        bool issub = (tag.GetName() == wxT("SUB"));
+        wxHtmlScriptMode oldmode = m_WParser->GetScriptMode();
+        int oldbase = m_WParser->GetScriptBaseline();
+        int oldsize = m_WParser->GetFontSize();
+
+        wxHtmlContainerCell *cont = m_WParser->GetContainer();
+        wxHtmlCell *c = cont->GetLastChild();
+
+        m_WParser->SetScriptMode(issub ? wxHTML_SCRIPT_SUB : wxHTML_SCRIPT_SUP);
+        m_WParser->SetScriptBaseline(oldbase + c->GetScriptBaseline());
+
+        // select smaller font
+        m_WParser->SetFontSize(m_WParser->GetFontSize()-2);
+        cont->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+
+        ParseInner(tag);
+
+        // restore font size
+        m_WParser->SetFontSize(oldsize);
+        m_WParser->GetContainer()->InsertCell(
+            new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+
+        // restore base and alignment
+        m_WParser->SetScriptBaseline(oldbase);
+        m_WParser->SetScriptMode(oldmode);
+
+        return true;
+    }
+
+TAG_HANDLER_END(SUBSUP)
+
+
 // Tag handler for tags that we have to ignore, otherwise non-text data
 // would show up as text:
 TAG_HANDLER_BEGIN(DoNothing, "SCRIPT")
@@ -408,6 +443,8 @@ TAG_HANDLER_END(DoNothing)
 
 
 
+
+
 TAGS_MODULE_BEGIN(Layout)
 
     TAGS_MODULE_ADD(P)
@@ -417,6 +454,7 @@ TAGS_MODULE_BEGIN(Layout)
     TAGS_MODULE_ADD(TITLE)
     TAGS_MODULE_ADD(BODY)
     TAGS_MODULE_ADD(BLOCKQUOTE)
+    TAGS_MODULE_ADD(SUBSUP)
     TAGS_MODULE_ADD(DoNothing)
 
 TAGS_MODULE_END(Layout)