fixing translation

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index bc2150ec69be4db65ab9ee41a680d328fae34699..e4242e6a6621764405e1e8d827534cd9ec23ffa0 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        m_layout.cpp
+// Name:        src/html/m_layout.cpp

 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -9,14 +9,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_HTML && wxUSE_STREAMS
+

 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP
 #endif
 


@@ -289,21 +287,19 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        if (m_WParser->GetWindow())
+        wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface();
+        if (winIface)

         {
         {

-            wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
-            if (wfr)
-            {
-                wxString title = m_WParser->GetSource()->Mid(
-                                        tag.GetBeginPos(),
-                                        tag.GetEndPos1()-tag.GetBeginPos());
+            wxString title = m_WParser->GetSource()->Mid(
+                                    tag.GetBeginPos(),
+                                    tag.GetEndPos1()-tag.GetBeginPos());

 #if !wxUSE_UNICODE && wxUSE_WCHAR_T
 #if !wxUSE_UNICODE && wxUSE_WCHAR_T

-                wxCSConv conv(m_WParser->GetInputEncoding());
-                title = wxString(title.wc_str(conv), wxConvLocal);
+            wxCSConv conv(m_WParser->GetInputEncoding());
+            title = wxString(title.wc_str(conv), wxConvLocal);

 #endif
 #endif

-                title = m_WParser->GetEntitiesParser()->Parse(title);
-                wfr->OnSetTitle(title);
-            }
+            title = m_WParser->GetEntitiesParser()->Parse(title);
+
+            winIface->SetHTMLWindowTitle(title);

         }
         return true;
     }
         }
         return true;
     }


@@ -329,6 +325,11 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         if (tag.GetParamAsColour(wxT("LINK"), &clr))
             m_WParser->SetLinkColor(clr);
 
         if (tag.GetParamAsColour(wxT("LINK"), &clr))
             m_WParser->SetLinkColor(clr);
 

+        wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface();
+        // the rest of this function requires a window:
+        if ( !winIface )
+            return false;
+

         if (tag.HasParam(wxT("BACKGROUND")))
         {
             wxFSFile *fileBgImage = m_WParser->OpenURL
         if (tag.HasParam(wxT("BACKGROUND")))
         {
             wxFSFile *fileBgImage = m_WParser->OpenURL


@@ -341,9 +342,11 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
                 wxInputStream *is = fileBgImage->GetStream();
                 if ( is )
                 {
                 wxInputStream *is = fileBgImage->GetStream();
                 if ( is )
                 {

+#if !defined(__WXMSW__) || wxUSE_WXDIB

                     wxImage image(*is);
                     if ( image.Ok() )
                     wxImage image(*is);
                     if ( image.Ok() )

-                        m_WParser->GetWindow()->SetBackgroundImage(image);
+                        winIface->SetHTMLBackgroundImage(image);
+#endif

                 }
             }
         }
                 }
             }
         }


@@ -352,8 +355,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         {
             m_WParser->GetContainer()->InsertCell(
                 new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
         {
             m_WParser->GetContainer()->InsertCell(
                 new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));

-            if (m_WParser->GetWindow() != NULL)
-                m_WParser->GetWindow()->SetBackgroundColour(clr);
+            winIface->SetHTMLBackgroundColour(clr);

         }
 
         return false;
         }
 
         return false;


@@ -392,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")
 // Tag handler for tags that we have to ignore, otherwise non-text data
 // would show up as text:
 TAG_HANDLER_BEGIN(DoNothing, "SCRIPT")


@@ -405,6 +443,8 @@ TAG_HANDLER_END(DoNothing)
 
 
 
 
 
 

+
+

 TAGS_MODULE_BEGIN(Layout)
 
     TAGS_MODULE_ADD(P)
 TAGS_MODULE_BEGIN(Layout)
 
     TAGS_MODULE_ADD(P)


@@ -414,6 +454,7 @@ TAGS_MODULE_BEGIN(Layout)
     TAGS_MODULE_ADD(TITLE)
     TAGS_MODULE_ADD(BODY)
     TAGS_MODULE_ADD(BLOCKQUOTE)
     TAGS_MODULE_ADD(TITLE)
     TAGS_MODULE_ADD(BODY)
     TAGS_MODULE_ADD(BLOCKQUOTE)

+    TAGS_MODULE_ADD(SUBSUP)

     TAGS_MODULE_ADD(DoNothing)
 
 TAGS_MODULE_END(Layout)
     TAGS_MODULE_ADD(DoNothing)
 
 TAGS_MODULE_END(Layout)