X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..657309a52bd20b14d5a431a6d4d107fd76f9569a:/src/html/m_links.cpp?ds=sidebyside diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp index c9881a1e58..cfb4d5b32c 100644 --- 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 -// Licence: wxWindows Licence +// 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" @@ -41,11 +36,11 @@ public: 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 { - if ((condition == wxHTML_COND_ISANCHOR) && + if ((condition == wxHTML_COND_ISANCHOR) && (m_AnchorName == (*((const wxString*)param)))) { return this; @@ -81,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())); - m_WParser->SetFontUnderlined(TRUE); + m_WParser->SetFontUnderlined(true); m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); m_WParser->SetLink(wxHtmlLinkInfo(name, target)); @@ -93,9 +88,9 @@ TAG_HANDLER_BEGIN(A, "A") 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)