Applied some of the SGI fixes. Don't know about the

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 50ac7fa5710de425fe0d1836b1a354cd9500fb9a..35c9736382ec6994e01c68a6a5963043b6b5362d 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -29,6 +29,7 @@
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/combobox.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"
 
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 


@@ -132,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
 
         //   (+ : 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;
         void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString)
             {
                 m_Config = config;


@@ -158,6 +147,24 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // ...
 
         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 AddToolbarButtons(wxToolBar *toolBar, int style);
+        // Add custom buttons to toolbar
+

         virtual void OptionsDialog();
         // Displays options dialog (fonts etc.)
 
         virtual void OptionsDialog();
         // Displays options dialog (fonts etc.)
 


@@ -198,6 +205,8 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxListBox *m_SearchList;
         wxChoice *m_SearchChoice;
         wxStaticText *m_IndexCountInfo;
         wxListBox *m_SearchList;
         wxChoice *m_SearchChoice;
         wxStaticText *m_IndexCountInfo;

+        wxCheckBox *m_SearchCaseSensitive;
+        wxCheckBox *m_SearchWholeWords;

 
         wxComboBox *m_Bookmarks;
         wxArrayString m_BookmarksNames, m_BookmarksPages;
 
         wxComboBox *m_Bookmarks;
         wxArrayString m_BookmarksNames, m_BookmarksPages;


@@ -217,12 +226,9 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         int m_FontSize; // 0,1,2 = small,medium,big
         wxString m_NormalFace, m_FixedFace;
 
         int m_FontSize; // 0,1,2 = small,medium,big
         wxString m_NormalFace, m_FixedFace;
 

-    protected:
-        void Init(wxHtmlHelpData* data = NULL);
-

         DECLARE_EVENT_TABLE()
 };
 
         DECLARE_EVENT_TABLE()
 };
 

-#endif
+#endif // wxUSE_HTML

 
 #endif
 
 #endif