added a preImage of the selection in order to avoid unnecessary events being triggered

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

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

 };
 
 
 };
 
 


@@ -568,9 +569,9 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
                  index = wxEmptyString,
                  charset = wxEmptyString;
 
                  index = wxEmptyString,
                  charset = wxEmptyString;
 

-#ifdef __WXMAC__
-        // wxIsAbsolutePath is broken
-        bookFull = wxGetCwd() + ":" + book;
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+        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