added cmdline.h/.cpp to the makefiles

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 9672fe0a7d7e448452c5a18c98787ae9e05d8e4b..2046603054cb65c91e7f3afaeb6bc8259fa10c91 100644 (file)
--- 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/notebook.h"
 #include "wx/listbox.h"
 #include "wx/choice.h"

+#include "wx/combobox.h"

 #include "wx/html/htmlwin.h"
 
 
 #include "wx/html/htmlwin.h"
 
 


@@ -36,7 +37,8 @@
 #define wxHF_CONTENTS     0x0002
 #define wxHF_INDEX        0x0004
 #define wxHF_SEARCH       0x0008
 #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 :
 
 
 // Command IDs :


@@ -46,9 +48,15 @@ enum
     wxID_HTML_BACK,
     wxID_HTML_FORWARD,
     wxID_HTML_OPTIONS,
     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_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_NOTEBOOK,
     wxID_HTML_SEARCHPAGE,
     wxID_HTML_SEARCHTEXT,


@@ -154,8 +162,11 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         void OnToolbar(wxCommandEvent& event);
         void OnContentsSel(wxTreeEvent& event);
         void OnIndexSel(wxCommandEvent& event);
         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 OnSearchSel(wxCommandEvent& event);
         void OnSearch(wxCommandEvent& event);

+        void OnBookmarksSel(wxCommandEvent& event);

         void OnCloseWindow(wxCloseEvent& event);
 
         // Images:
         void OnCloseWindow(wxCloseEvent& event);
 
         // Images:


@@ -176,12 +187,18 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxNotebook *m_NavigPan;
         wxTreeCtrl *m_ContentsBox;
         wxImageList *m_ContentsImageList;
         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;
 
         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;
         wxHtmlHelpFrameCfg m_Cfg;
 
         wxConfigBase *m_Config;


@@ -196,7 +213,6 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxArrayString *m_NormalFonts, *m_FixedFonts;
         int m_FontSize; // 0,1,2 = small,medium,big
         wxString m_NormalFace, m_FixedFace;
         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);
 
     protected:
         void Init(wxHtmlHelpData* data = NULL);