fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index dd7135f7d204193f2ebd0691f88763a8a04baf4f..9bbc121d66680fd8fe31808a56e63073e3da9aad 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -60,6 +60,11 @@ public:
     void SetBasePath(const wxString& path) { m_BasePath = path; }
     void SetStart(const wxString& start) { m_Start = start; }
 
     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_BasePath;
     wxString m_Title;
 protected:
     wxString m_BasePath;
     wxString m_Title;


@@ -79,6 +84,9 @@ struct wxHtmlContentsItem
     wxChar* m_Name;
     wxChar* m_Page;
     wxHtmlBookRecord *m_Book;
     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 +204,6 @@ protected:
     bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
 };
 
     bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
 };
 

-// Utility function
-wxString wxAddBasePath(const wxString& basePath, const wxString& path) ;
-

 #endif
 
 #endif
 #endif
 
 #endif