X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7995487f3032d8415f87619efac7c391c72730..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/html/helpdata.h diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index d1f8f4bf79..0c110f0a20 100644 --- a/include/wx/html/helpdata.h +++ b/include/wx/html/helpdata.h @@ -12,7 +12,7 @@ #ifndef _WX_HELPDATA_H_ #define _WX_HELPDATA_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "helpdata.h" #endif @@ -32,18 +32,20 @@ class WXDLLEXPORT wxHtmlHelpData; // helper classes & structs //-------------------------------------------------------------------------------- -class WXDLLEXPORT wxHtmlBookRecord : public wxObject +class WXDLLEXPORT wxHtmlBookRecord { public: - wxHtmlBookRecord(const wxString& basepath, const wxString& title, - const wxString& start) + wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath, + const wxString& title, const wxString& start) { + m_BookFile = bookfile; m_BasePath = basepath; m_Title = title; m_Start = start; // for debugging, give the contents index obvious default values m_ContentsStart = m_ContentsEnd = -1; } + wxString GetBookFile() const { return m_BookFile; } wxString GetTitle() const { return m_Title; } wxString GetStart() const { return m_Start; } wxString GetBasePath() const { return m_BasePath; } @@ -66,6 +68,7 @@ public: wxString GetFullPath(const wxString &page) const; protected: + wxString m_BookFile; wxString m_BasePath; wxString m_Title; wxString m_Start; @@ -90,28 +93,30 @@ struct wxHtmlContentsItem }; //------------------------------------------------------------------------------ -// wxSearchEngine +// wxHtmlSearchEngine // This class takes input streams and scans them for occurence // of keyword(s) //------------------------------------------------------------------------------ -class WXDLLEXPORT wxSearchEngine : public wxObject +class WXDLLEXPORT wxHtmlSearchEngine : public wxObject { 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 - virtual bool Scan(wxInputStream *stream); + virtual bool Scan(const wxFSFile& file); private: wxChar *m_Keyword; bool m_CaseSensitive; bool m_WholeWords; + + DECLARE_NO_COPY_CLASS(wxHtmlSearchEngine) }; @@ -136,7 +141,7 @@ public: private: wxHtmlHelpData* m_Data; - wxSearchEngine m_Engine; + wxHtmlSearchEngine m_Engine; wxString m_Keyword, m_Name; wxChar *m_LastPage; wxHtmlContentsItem* m_ContentsItem; @@ -144,6 +149,8 @@ private: int m_CurIndex; // where we are now int m_MaxIndex; // number of files we search // For progress bar: 100*curindex/maxindex = % complete + + DECLARE_NO_COPY_CLASS(wxHtmlSearchStatus) }; class WXDLLEXPORT wxHtmlHelpData : public wxObject @@ -171,7 +178,6 @@ public: const wxString& deftopic = wxEmptyString, const wxString& path = wxEmptyString); - bool wxHtmlHelpData::AlreadyHasBook(wxHtmlBookRecord * bookr) ; // Some accessing stuff: // returns URL of page on basis of (file)name @@ -203,6 +209,8 @@ protected: bool LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f); // Writes binary book bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f); + + DECLARE_NO_COPY_CLASS(wxHtmlHelpData) }; #endif