X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83efdf3393ca396e96d44892eae0a77cb772f6f2..298d19f9adbbf0de58eb6593e97fadd86fe1a5f6:/include/wx/html/helpfrm.h

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 9672fe0a7d..80256d84af 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -28,6 +28,9 @@
 #include "wx/notebook.h"
 #include "wx/listbox.h"
 #include "wx/choice.h"
+#include "wx/combobox.h"
+#include "wx/checkbox.h"
+#include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 
 
@@ -36,7 +39,8 @@
 #define wxHF_CONTENTS     0x0002
 #define wxHF_INDEX        0x0004
 #define wxHF_SEARCH       0x0008
-#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH)
+#define wxHF_BOOKMARKS    0x0010
+#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH | wxHF_BOOKMARKS)
 
 
 // Command IDs :
@@ -46,15 +50,22 @@ enum
     wxID_HTML_BACK,
     wxID_HTML_FORWARD,
     wxID_HTML_OPTIONS,
+    wxID_HTML_BOOKMARKSLIST,
+    wxID_HTML_BOOKMARKSADD,
+    wxID_HTML_BOOKMARKSREMOVE,
     wxID_HTML_TREECTRL,
     wxID_HTML_INDEXPAGE,
     wxID_HTML_INDEXLIST,
+    wxID_HTML_INDEXTEXT,
+    wxID_HTML_INDEXBUTTON,
+    wxID_HTML_INDEXBUTTONALL,
     wxID_HTML_NOTEBOOK,
     wxID_HTML_SEARCHPAGE,
     wxID_HTML_SEARCHTEXT,
     wxID_HTML_SEARCHLIST,
     wxID_HTML_SEARCHBUTTON,
     wxID_HTML_SEARCHCHOICE,
+    wxID_HTML_COUNTINFO,
     wxID_HTML_HELPFRAME // the id of wxHtmlHelpController's helpframe
 }
 ;
@@ -122,18 +133,6 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         //   (+ : page must contain the word ; - : page can't contain the word)
         // * if there is no + or - before the word, + is default
 
-        void RefreshLists(bool show_progress = FALSE);
-        // Refreshes Contents and Index tabs
-
-        void CreateContents(bool show_progress = FALSE);
-        // Adds items to m_Contents tree control
-
-        void CreateIndex(bool show_progress = FALSE);
-        // Adds items to m_IndexList
-
-        void CreateSearch();
-        // Add books to search choice panel
-
         void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString)
             {
                 m_Config = config;
@@ -148,14 +147,33 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // ...
 
+    protected:
+        void Init(wxHtmlHelpData* data = NULL);
+
+        void RefreshLists();
+        // Refreshes Contents and Index tabs
+
+        void CreateContents();
+        // Adds items to m_Contents tree control
+
+        void CreateIndex();
+        // Adds items to m_IndexList
+
+        void CreateSearch();
+        // Add books to search choice panel
+
+
         virtual void OptionsDialog();
         // Displays options dialog (fonts etc.)
 
         void OnToolbar(wxCommandEvent& event);
         void OnContentsSel(wxTreeEvent& event);
         void OnIndexSel(wxCommandEvent& event);
+        void OnIndexFind(wxCommandEvent& event);
+        void OnIndexAll(wxCommandEvent& event);
         void OnSearchSel(wxCommandEvent& event);
         void OnSearch(wxCommandEvent& event);
+        void OnBookmarksSel(wxCommandEvent& event);
         void OnCloseWindow(wxCloseEvent& event);
 
         // Images:
@@ -176,11 +194,20 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxNotebook *m_NavigPan;
         wxTreeCtrl *m_ContentsBox;
         wxImageList *m_ContentsImageList;
-        wxListBox *m_IndexBox;
+        wxTextCtrl *m_IndexText;
+        wxButton *m_IndexButton;
+        wxButton *m_IndexButtonAll;
+        wxListBox *m_IndexList;
         wxTextCtrl *m_SearchText;
         wxButton *m_SearchButton;
         wxListBox *m_SearchList;
         wxChoice *m_SearchChoice;
+        wxStaticText *m_IndexCountInfo;
+        wxCheckBox *m_SearchCaseSensitive;
+        wxCheckBox *m_SearchWholeWords;
+
+        wxComboBox *m_Bookmarks;
+        wxArrayString m_BookmarksNames, m_BookmarksPages;
 
         wxHtmlHelpFrameCfg m_Cfg;
 
@@ -196,14 +223,10 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxArrayString *m_NormalFonts, *m_FixedFonts;
         int m_FontSize; // 0,1,2 = small,medium,big
         wxString m_NormalFace, m_FixedFace;
-        int m_NormalItalic, m_FixedItalic;
-
-    protected:
-        void Init(wxHtmlHelpData* data = NULL);
 
         DECLARE_EVENT_TABLE()
 };
 
-#endif
+#endif // wxUSE_HTML
 
 #endif