X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9749497156909657d17ef972857caaca4bd09da2..b5a7cdc076ec7a35990b2da37a4b7b81a9cc8f85:/include/wx/html/helpdata.h

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index dd7135f7d2..0780cac6b0 100644
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -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; }
@@ -60,7 +62,13 @@ public:
     void SetBasePath(const wxString& path) { m_BasePath = path; }
     void SetStart(const wxString& start) { m_Start = start; }
 
+    // returns full filename of page (which is part of the book), 
+    // i.e. with book's basePath prepended. If page is already absolute 
+    // path, basePath is _not_ prepended.
+    wxString GetFullPath(const wxString &page) const;
+
 protected:
+    wxString m_BookFile;
     wxString m_BasePath;
     wxString m_Title;
     wxString m_Start;
@@ -79,6 +87,9 @@ struct wxHtmlContentsItem
     wxChar* m_Name;
     wxChar* m_Page;
     wxHtmlBookRecord *m_Book;
+    
+    // returns full filename of m_Page, i.e. with book's basePath prepended
+    wxString GetFullPath() const { return m_Book->GetFullPath(m_Page); }
 };
 
 //------------------------------------------------------------------------------
@@ -196,9 +207,6 @@ protected:
     bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
 };
 
-// Utility function
-wxString wxAddBasePath(const wxString& basePath, const wxString& path) ;
-
 #endif
 
 #endif