Declare strptime when using MSL headers on OS X.

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

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 7ae39b983a98f5f65ae32b9beb8ad0211fd886f4..434d01d55c527a7de62acd5cb9c8fd3cf389e66a 100644 (file)
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation
 #endif
 
@@ -41,11 +41,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 +81,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 +93,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)