X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53e46b61bbe4ce72b92c8898907f0a879d5f012b..e4315700228573d42a9afb1498fec4ee7b95ccb0:/src/html/helpdata.cpp?ds=sidebyside

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 6ba01be7f7..beb05d3d65 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -73,9 +73,10 @@ static int LINKAGEMODE IndexCompareFunc(const void *a, const void *b)
 
 class HP_Parser : public wxHtmlParser
 {
-    public:
-        void AddText(const char* WXUNUSED(text)) { }
-        wxObject* GetProduct() { return NULL; }
+public:
+    wxObject* GetProduct() { return NULL; }
+protected:
+    virtual void AddText(const wxChar* WXUNUSED(txt)) {}
 };
 
 
@@ -568,7 +569,7 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
                  index = wxEmptyString,
                  charset = wxEmptyString;
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__DARWIN__)
         if (wxIsAbsolutePath(book)) bookFull = book;
         else bookFull = wxGetCwd() + book; // no slash or dot
         wxFileName fn( bookFull );