Removed redundant m_left etc. variables

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

diff --git a/include/wx/html/helpdata.h b/include/wx/html/helpdata.h
index 5593fa72c90f52f56b5c29f54209336dfff96c39..906d12b13b53e20d686035386dd21e575313a77e 100644 (file)
--- a/include/wx/html/helpdata.h
+++ b/include/wx/html/helpdata.h
@@ -24,6 +24,7 @@
 #include "wx/string.h"
 #include "wx/filesys.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/filesys.h"
 #include "wx/dynarray.h"

+#include "wx/font.h"

 
 //--------------------------------------------------------------------------------
 // helper classes & structs
 
 //--------------------------------------------------------------------------------
 // helper classes & structs


@@ -124,14 +125,14 @@ class WXDLLEXPORT wxHtmlSearchStatus
     private:
         wxHtmlHelpData* m_Data;
         wxSearchEngine m_Engine;
     private:
         wxHtmlHelpData* m_Data;
         wxSearchEngine m_Engine;

-        wxString m_Keyword, m_Name, m_LastPage;
+        wxString m_Keyword, m_Name;
+        wxChar *m_LastPage;

         wxHtmlContentsItem* m_ContentsItem;
         wxHtmlContentsItem* m_ContentsItem;

-        bool m_Active;  // search is not finished
+        bool m_Active;   // search is not finished

         int m_CurIndex;  // where we are now
         int m_MaxIndex;  // number of files we search
         // For progress bar: 100*curindex/maxindex = % complete
         int m_CurIndex;  // where we are now
         int m_MaxIndex;  // number of files we search
         // For progress bar: 100*curindex/maxindex = % complete

-}
-;
+};

 
 class WXDLLEXPORT wxHtmlHelpData : public wxObject
 {
 
 class WXDLLEXPORT wxHtmlHelpData : public wxObject
 {


@@ -152,7 +153,9 @@ class WXDLLEXPORT wxHtmlHelpData : public wxObject
         // Adds new book. 'book' is location of .htb file (stands for "html book").
         // See documentation for details on its format.
         // Returns success.
         // Adds new book. 'book' is location of .htb file (stands for "html book").
         // See documentation for details on its format.
         // Returns success.

-        bool AddBookParam(const wxString& title, const wxString& contfile,
+        bool AddBookParam(const wxFSFile& bookfile,
+                          wxFontEncoding encoding,
+                          const wxString& title, const wxString& contfile,

                           const wxString& indexfile = wxEmptyString,
                           const wxString& deftopic = wxEmptyString,
                           const wxString& path = wxEmptyString);
                           const wxString& indexfile = wxEmptyString,
                           const wxString& deftopic = wxEmptyString,
                           const wxString& path = wxEmptyString);


@@ -189,8 +192,7 @@ class WXDLLEXPORT wxHtmlHelpData : public wxObject
         // Reads binary book
         bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
         // Writes binary book
         // Reads binary book
         bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f);
         // Writes binary book

-}
-;
+};

 
 #endif
 
 
 #endif