X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/html/m_links.cpp

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 708e00a84d..308fa73b34 100644
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        m_links.cpp
+// Name:        src/html/m_links.cpp
 // Purpose:     wxHtml module for links & anchors
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -7,24 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
+#include "wx/html/styleparams.h"
 
 
 FORCE_LINK_ME(m_links)
@@ -45,7 +41,7 @@ public:
 
     virtual const wxHtmlCell* Find(int condition, const void* param) const
     {
-        if ((condition == wxHTML_COND_ISANCHOR) && 
+        if ((condition == wxHTML_COND_ISANCHOR) &&
             (m_AnchorName == (*((const wxString*)param))))
         {
             return this;
@@ -56,7 +52,7 @@ public:
         }
     }
 
-    DECLARE_NO_COPY_CLASS(wxHtmlAnchorCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlAnchorCell);
 };
 
 
@@ -75,27 +71,52 @@ TAG_HANDLER_BEGIN(A, "A")
         {
             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->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);
 
             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));
 
-            return TRUE;
+            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)