OS/2 updates for statusbar processing and easier VA debugging

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

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 58876ee6df396b765bc1c9a6cc7fbd0e4d081e82..e21c9e2f69c7040cdd5d8a31094fe01606d18b38 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$


@@ -11,16 +11,17 @@
 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 

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

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP

-#include <wx/wx.h>
+#include "wx/wx.h"

 #endif
 
 
 #endif
 
 


@@ -28,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


@@ -40,7 +41,7 @@ class wxHtmlAnchorCell : public wxHtmlCell
         wxHtmlAnchorCell(const wxString& name) : wxHtmlCell() {m_AnchorName = name;}
         virtual const wxHtmlCell* Find(int condition, const void* param) const
         {
         wxHtmlAnchorCell(const wxString& name) : wxHtmlCell() {m_AnchorName = name;}
         virtual const wxHtmlCell* Find(int condition, const void* param) const
         {

-            if ((condition == HTML_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);


@@ -58,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);