move m_sizeSet out of wxWindow

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

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index b1f0d0876f95bb537125bf29e1abde34c79c0728..cfb4d5b32c181e3ee2776cc0a95dd4f754e3d3de 100644 (file)
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -1,26 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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 __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP

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


@@ -41,11 +36,11 @@ public:
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),

-              wxHtmlRenderingState& WXUNUSED(state)) {}
+              wxHtmlRenderingInfo& WXUNUSED(info)) {}

 
     virtual const wxHtmlCell* Find(int condition, const void* param) const
     {
 
     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;
             (m_AnchorName == (*((const wxString*)param))))
         {
             return this;


@@ -55,11 +50,14 @@ public:
             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)
     {


@@ -78,7 +76,7 @@ TAG_HANDLER_BEGIN(A, "A")
             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()));
             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->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));
 


@@ -90,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)