Ifdef'ed back in the scrolling aware drawing code in wxHtmlWidgetCell

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

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index b3c25e134dcfe59acaa89b72d089522b8a879fe8..9379ddd1d9231a873d050c16feeba6ba5049820e 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -4,14 +4,13 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
-// Created:
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "helpdata.h"
+#pragma implementation
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -33,7 +32,7 @@
 #include "wx/tokenzr.h"
 #include "wx/wfstream.h"
 #include "wx/busyinfo.h"
-#include "wx/html/htmlparser.h"
+#include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"
 
 #include "wx/arrimpl.cpp"
@@ -82,8 +81,8 @@ static int IndexCompareFunc(const void *a, const void *b)
 class HP_Parser : public wxHtmlParser
 {
     public:
-        void AddText(const char* text) {}
-        wxObject* GetProduct() {return NULL;}
+        void AddText(const char* WXUNUSED(text)) { }
+        wxObject* GetProduct() { return NULL; }
 };
 
 
@@ -565,7 +564,7 @@ bool wxHtmlSearchStatus::Search()
            if (m_Engine.Scan(file -> GetStream())) {
                m_Name = m_Data->m_Contents[i].m_Name;
                m_ContentsItem = m_Data->m_Contents + i;
-               found = true;
+               found = TRUE;
            }
        }
        delete file;