The wxMAKE_UNIQUE_ASSERT_NAME fix for VC++ does not work for MetroWerks CW.

[wxWidgets.git] / include / wx / html / helpdata.h

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 0780cac6b0c6fd6fe3644733bb8660c47e514b48..cf318613f2e237c8188224ec074b4bb7c1170e43 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPDATA_H_
 #define _WX_HELPDATA_H_
 
 #ifndef _WX_HELPDATA_H_
 #define _WX_HELPDATA_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "helpdata.h"
 #endif
 
 #pragma interface "helpdata.h"
 #endif
 


@@ -93,23 +93,23 @@ struct wxHtmlContentsItem
 };
 
 //------------------------------------------------------------------------------
 };
 
 //------------------------------------------------------------------------------

-// wxSearchEngine
+// wxHtmlSearchEngine

 //                  This class takes input streams and scans them for occurence
 //                  of keyword(s)
 //------------------------------------------------------------------------------
 
 //                  This class takes input streams and scans them for occurence
 //                  of keyword(s)
 //------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSearchEngine : public wxObject
+class WXDLLEXPORT wxHtmlSearchEngine : public wxObject

 {
 public:
 {
 public:

-    wxSearchEngine() : wxObject() {m_Keyword = NULL; }
-    ~wxSearchEngine() {if (m_Keyword) delete[] m_Keyword; }
+    wxHtmlSearchEngine() : wxObject() {m_Keyword = NULL; }
+    ~wxHtmlSearchEngine() {if (m_Keyword) delete[] m_Keyword; }

 
     // Sets the keyword we will be searching for
     virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only);
 
     // Scans the stream for the keyword.
     // Returns TRUE if the stream contains keyword, fALSE otherwise
 
     // Sets the keyword we will be searching for
     virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only);
 
     // Scans the stream for the keyword.
     // Returns TRUE if the stream contains keyword, fALSE otherwise

-    virtual bool Scan(wxInputStream *stream);
+    virtual bool Scan(const wxFSFile& file);

 
 private:
     wxChar *m_Keyword;
 
 private:
     wxChar *m_Keyword;


@@ -139,7 +139,7 @@ public:
 
 private:
     wxHtmlHelpData* m_Data;
 
 private:
     wxHtmlHelpData* m_Data;

-    wxSearchEngine m_Engine;
+    wxHtmlSearchEngine m_Engine;

     wxString m_Keyword, m_Name;
     wxChar *m_LastPage;
     wxHtmlContentsItem* m_ContentsItem;
     wxString m_Keyword, m_Name;
     wxChar *m_LastPage;
     wxHtmlContentsItem* m_ContentsItem;