X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5bb85a0a4f28df1b966481de9a320806bbb1471..2a36259f27f58de31cdd66d6c5176e776fc25df3:/include/wx/html/helpfrm.h?ds=inline

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index b227572e2b..2046603054 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -28,6 +28,7 @@
 #include "wx/notebook.h"
 #include "wx/listbox.h"
 #include "wx/choice.h"
+#include "wx/combobox.h"
 #include "wx/html/htmlwin.h"
 
 
@@ -36,7 +37,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 :
@@ -45,9 +47,16 @@ enum
     wxID_HTML_PANEL = wxID_HIGHEST + 1,
     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,
@@ -61,7 +70,7 @@ enum
 
 typedef struct
 {
-    long x, y, w, h;
+    int x, y, w, h;
     long sashpos;
     bool navig_on;
 }
@@ -120,38 +129,52 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         // * word may be pretended by + or -
         //   (+ : 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;
-            m_ConfigRoot = rootpath;
-            ReadCustomization(config, rootpath);
-        }
+            {
+                m_Config = config;
+                m_ConfigRoot = rootpath;
+                ReadCustomization(config, rootpath);
+            }
+
         void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // saves custom settings into cfg config. it will use the path 'path'
         // if given, otherwise it will save info into currently selected path.
         // saved values : things set by SetFonts, SetBorders.
         void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // ...
+
+        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:
         enum {
             IMG_Book = 0,
             IMG_Folder,
-            IMG_Page
+            IMG_Page,
+            IMG_RootFolder
         };
 
     protected:
@@ -164,12 +187,18 @@ 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;
 
+        wxComboBox *m_Bookmarks;
+        wxArrayString m_BookmarksNames, m_BookmarksPages;
+
         wxHtmlHelpFrameCfg m_Cfg;
 
         wxConfigBase *m_Config;
@@ -179,6 +208,11 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         int m_ContentsPage;
         int m_IndexPage;
         int m_SearchPage;
+        
+        // lists of available fonts (used in options dialog)
+        wxArrayString *m_NormalFonts, *m_FixedFonts;
+        int m_FontSize; // 0,1,2 = small,medium,big
+        wxString m_NormalFace, m_FixedFace;
 
     protected:
         void Init(wxHtmlHelpData* data = NULL);