don't use assert dialog under wxDFB, it does more harm than good

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

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 4ac7d3251c292ab395f9c7f372264923a6d316d5..cfb4d5b32c181e3ee2776cc0a95dd4f754e3d3de 100644 (file)
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -1,29 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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 && wxUSE_STREAMS
-
-#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"


@@ -34,42 +27,56 @@ 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))))
+        {
+            return this;
+        }
+        else

         {
         {

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

         }
         }

+    }
+
+    DECLARE_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")) 
-           {
+        if (tag.HasParam( wxT("HREF") ))
+        {

             wxHtmlLinkInfo oldlnk = m_WParser->GetLink();
             wxColour oldclr = m_WParser->GetActualColor();
             int oldund = m_WParser->GetFontUnderlined();
             wxHtmlLinkInfo oldlnk = m_WParser->GetLink();
             wxColour oldclr = m_WParser->GetActualColor();
             int oldund = m_WParser->GetFontUnderlined();

-            wxString name(tag.GetParam("HREF")), target;
+            wxString name(tag.GetParam( wxT("HREF") )), target;

 
 

-            if (tag.HasParam("TARGET")) target = tag.GetParam("TARGET");
+            if (tag.HasParam( wxT("TARGET") )) target = tag.GetParam( wxT("TARGET") );

             m_WParser->SetActualColor(m_WParser->GetLinkColor());
             m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(m_WParser->GetLinkColor()));
             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));
 
             m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
             m_WParser->SetLink(wxHtmlLinkInfo(name, target));
 


@@ -81,9 +88,9 @@ TAG_HANDLER_BEGIN(A, "A")
             m_WParser->SetActualColor(oldclr);
             m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
 
             m_WParser->SetActualColor(oldclr);
             m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr));
 

-            return TRUE;
+            return true;

         }
         }

-        else return FALSE;
+        else return false;

     }
 
 TAG_HANDLER_END(A)
     }
 
 TAG_HANDLER_END(A)