moved wxDash typedef to gdicmn.h

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

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 462cd36acf01a752c0c10b3f6543ee3b1d053aa6..a20252dfd147aa1f77ac1c291c05b7fa812ce9de 100644 (file)
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mod_links.cpp
+// Name:        m_links.cpp

 // Purpose:     wxHtml module for links & anchors
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtml module for links & anchors
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -29,7 +29,7 @@
 #include "wx/html/m_templ.h"
 
 
 #include "wx/html/m_templ.h"
 
 

-FORCE_LINK_ME(mod_links)
+FORCE_LINK_ME(m_links)

 
 
 class wxHtmlAnchorCell : public wxHtmlCell
 
 
 class wxHtmlAnchorCell : public wxHtmlCell


@@ -59,15 +59,17 @@ TAG_HANDLER_BEGIN(A, "A")
         }
 
         if (tag.HasParam("HREF")) {
         }
 
         if (tag.HasParam("HREF")) {

-            wxString oldlnk = m_WParser -> GetLink();
+            wxHtmlLinkInfo oldlnk = m_WParser -> GetLink();

             wxColour oldclr = m_WParser -> GetActualColor();
             int oldund = m_WParser -> GetFontUnderlined();
             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 -> 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(tag.GetParam("HREF"));
+            m_WParser -> SetLink(wxHtmlLinkInfo(name, target));

 
             ParseInner(tag);
 
 
             ParseInner(tag);