X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/468ae730db4954d31f5b30d09bd0301333f2f45b..009a066588622dd8d07343756b3e0922d2c9ebd4:/include/wx/html/helpdata.h diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h index 9bbc121d66..72612cf2b1 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;