missing commit

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

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index a20252dfd147aa1f77ac1c291c05b7fa812ce9de..308fa73b343988e134f20ddce799316c840362a8 100644 (file)
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -1,32 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxHtml module for links & anchors
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxHtml module for links & anchors
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

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

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

-#ifdef __GNUG__
-#pragma implementation
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_HTML && wxUSE_STREAMS

 
 

+#ifndef WX_PRECOMP
+#endif

 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"

+#include "wx/html/styleparams.h"

 
 
 FORCE_LINK_ME(m_links)
 
 
 FORCE_LINK_ME(m_links)


@@ -34,54 +28,95 @@ FORCE_LINK_ME(m_links)
 
 class wxHtmlAnchorCell : public wxHtmlCell
 {
 
 class wxHtmlAnchorCell : public wxHtmlCell
 {

-    private:
-        wxString m_AnchorName;
-
-    public:
-        wxHtmlAnchorCell(const wxString& name) : wxHtmlCell() {m_AnchorName = name;}
-        virtual const wxHtmlCell* Find(int condition, const void* param) const
+private:
+    wxString m_AnchorName;
+
+public:
+    wxHtmlAnchorCell(const wxString& name) : wxHtmlCell()
+        { m_AnchorName = name; }
+    void Draw(wxDC& WXUNUSED(dc),
+              int WXUNUSED(x), int WXUNUSED(y),
+              int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+              wxHtmlRenderingInfo& WXUNUSED(info)) {}
+
+    virtual const wxHtmlCell* Find(int condition, const void* param) const
+    {
+        if ((condition == wxHTML_COND_ISANCHOR) &&
+            (m_AnchorName == (*((const wxString*)param))))

         {
         {

-            if ((condition == wxHTML_COND_ISANCHOR) && (m_AnchorName == (*((const wxString*)param))))
-                return this;
-            else
-                return wxHtmlCell::Find(condition, param);
+            return this;

         }
         }

+        else
+        {
+            return wxHtmlCell::Find(condition, param);
+        }
+    }
+
+    wxDECLARE_NO_COPY_CLASS(wxHtmlAnchorCell);

 };
 
 
 
 TAG_HANDLER_BEGIN(A, "A")
 };
 
 
 
 TAG_HANDLER_BEGIN(A, "A")

+    TAG_HANDLER_CONSTR(A) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-        if (tag.HasParam("NAME")) {
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlAnchorCell(tag.GetParam("NAME")));
+        if (tag.HasParam( wxT("NAME") ))
+        {
+            m_WParser->GetContainer()->InsertCell(new wxHtmlAnchorCell(tag.GetParam( wxT("NAME") )));

         }
 
         }
 

-        if (tag.HasParam("HREF")) {
-            wxHtmlLinkInfo oldlnk = m_WParser -> GetLink();
-            wxColour oldclr = m_WParser -> GetActualColor();
-            int oldund = m_WParser -> GetFontUnderlined();
-            wxString name(tag.GetParam("HREF")), target;
-
-            if (tag.HasParam("TARGET")) target = tag.GetParam("TARGET");
-            m_WParser -> SetActualColor(m_WParser -> GetLinkColor());
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(m_WParser -> GetLinkColor()));
-            m_WParser -> SetFontUnderlined(TRUE);
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-            m_WParser -> SetLink(wxHtmlLinkInfo(name, target));
+        if (tag.HasParam( wxT("HREF") ))
+        {
+            wxHtmlLinkInfo oldlnk = m_WParser->GetLink();
+            wxColour oldclr = m_WParser->GetActualColor();
+            wxColour oldbackclr = m_WParser->GetActualBackgroundColor();
+            int oldbackmode = m_WParser->GetActualBackgroundMode();
+            int oldsize = m_WParser->GetFontSize();
+            int oldbold = m_WParser->GetFontBold();
+            int olditalic = m_WParser->GetFontItalic();
+            int oldund = m_WParser->GetFontUnderlined();
+            wxString oldfontface = m_WParser->GetFontFace();
+            wxString name(tag.GetParam( wxT("HREF") )), target;
+
+            if (tag.HasParam( wxT("TARGET") )) target = tag.GetParam( wxT("TARGET") );
+
+            // set default styles, might get overridden by ApplyStyle
+            m_WParser->SetActualColor(m_WParser->GetLinkColor());
+            m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(m_WParser->GetLinkColor()));
+            m_WParser->SetFontUnderlined(true);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+            m_WParser->SetLink(wxHtmlLinkInfo(name, target));
+
+            // Load any style parameters
+            wxHtmlStyleParams styleParams(tag);
+            ApplyStyle(styleParams);

 
             ParseInner(tag);
 
 
             ParseInner(tag);
 

-            m_WParser -> SetLink(oldlnk);
-            m_WParser -> SetFontUnderlined(oldund);
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
-            m_WParser -> SetActualColor(oldclr);
-            m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(oldclr));
-
-            return TRUE;
+            m_WParser->SetLink(oldlnk);
+            m_WParser->SetFontSize(oldsize);
+            m_WParser->SetFontBold(oldbold);
+            m_WParser->SetFontFace(oldfontface);
+            m_WParser->SetFontItalic(olditalic);
+            m_WParser->SetFontUnderlined(oldund);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+            m_WParser->SetActualColor(oldclr);
+            m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
+
+            if (oldbackmode != m_WParser->GetActualBackgroundMode() ||
+                oldbackclr != m_WParser->GetActualBackgroundColor())
+            {
+               m_WParser->SetActualBackgroundMode(oldbackmode);
+               m_WParser->SetActualBackgroundColor(oldbackclr);
+               m_WParser->GetContainer()->InsertCell(
+                   new wxHtmlColourCell(oldbackclr, oldbackmode == wxTRANSPARENT ? wxHTML_CLR_TRANSPARENT_BACKGROUND : wxHTML_CLR_BACKGROUND));
+            }
+
+            return true;

         }
         }

-        else return FALSE;
+        else return false;

     }
 
 TAG_HANDLER_END(A)
     }
 
 TAG_HANDLER_END(A)