added wcslen prototype declaration for Darwin/FreeBSD, wcslen is in wxchar.cpp

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

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 7cf0465e1e6f067ecdea3ee1be4bf6af548dc5ea..a3b76378e9235b938e41aadae251b44f8e559b1a 100644 (file)
--- 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
 {
 
 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)) {}

 };
 
 
 };
 
 


@@ -569,8 +570,8 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
                  charset = wxEmptyString;
 
 #ifdef __WXMAC__
                  charset = wxEmptyString;
 
 #ifdef __WXMAC__

-        // wxIsAbsolutePath is broken
-        bookFull = wxGetCwd() + ":" + book;
+        if (wxIsAbsolutePath(book)) bookFull = book;
+        else bookFull = wxGetCwd() + book; // no slash or dot

         wxFileName fn( bookFull );
         bookFull = fn.GetFullPath( wxPATH_UNIX );
 #else
         wxFileName fn( bookFull );
         bookFull = fn.GetFullPath( wxPATH_UNIX );
 #else