fixed DeleteContents inconsistency: didn't free memory if DeleteContents called befor...

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 43ef2e37f1b96e4f1cc0967685eac1ad7758b2f9..437314805bd49a4c5e5b83aaf415db141ae08731 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -29,7 +29,10 @@
 #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/html/htmlwin.h"

+#include "wx/html/htmprint.h"

 
 
 // style flags for the Help Frame
 
 
 // style flags for the Help Frame


@@ -38,7 +41,9 @@
 #define wxHF_INDEX        0x0004
 #define wxHF_SEARCH       0x0008
 #define wxHF_BOOKMARKS    0x0010
 #define wxHF_INDEX        0x0004
 #define wxHF_SEARCH       0x0008
 #define wxHF_BOOKMARKS    0x0010

-#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH | wxHF_BOOKMARKS)
+#define wxHF_OPENFILES    0x0020
+#define wxHF_PRINT        0x0040
+#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH | wxHF_BOOKMARKS | wxHF_PRINT)

 
 
 // Command IDs :
 
 
 // Command IDs :


@@ -47,6 +52,11 @@ enum
     wxID_HTML_PANEL = wxID_HIGHEST + 1,
     wxID_HTML_BACK,
     wxID_HTML_FORWARD,
     wxID_HTML_PANEL = wxID_HIGHEST + 1,
     wxID_HTML_BACK,
     wxID_HTML_FORWARD,

+    wxID_HTML_UPNODE,
+    wxID_HTML_UP,
+    wxID_HTML_DOWN,
+    wxID_HTML_PRINT,
+    wxID_HTML_OPENFILE,

     wxID_HTML_OPTIONS,
     wxID_HTML_BOOKMARKSLIST,
     wxID_HTML_BOOKMARKSADD,
     wxID_HTML_OPTIONS,
     wxID_HTML_BOOKMARKSLIST,
     wxID_HTML_BOOKMARKSADD,


@@ -63,6 +73,7 @@ enum
     wxID_HTML_SEARCHLIST,
     wxID_HTML_SEARCHBUTTON,
     wxID_HTML_SEARCHCHOICE,
     wxID_HTML_SEARCHLIST,
     wxID_HTML_SEARCHBUTTON,
     wxID_HTML_SEARCHCHOICE,

+    wxID_HTML_COUNTINFO,

     wxID_HTML_HELPFRAME // the id of wxHtmlHelpController's helpframe
 }
 ;
     wxID_HTML_HELPFRAME // the id of wxHtmlHelpController's helpframe
 }
 ;


@@ -93,12 +104,7 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 
         wxHtmlHelpData* GetData() { return m_Data; }
 
 
         wxHtmlHelpData* GetData() { return m_Data; }
 

-        void SetTitleFormat(const wxString& format)
-        {
-            if (m_HtmlWin)
-                m_HtmlWin->SetRelatedFrame(this, format);
-            m_TitleFormat = format;
-        }
+        void SetTitleFormat(const wxString& format);

         // Sets format of title of the frame. Must contain exactly one "%s"
         // (for title of displayed HTML page)
 
         // Sets format of title of the frame. Must contain exactly one "%s"
         // (for title of displayed HTML page)
 


@@ -130,18 +136,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;


@@ -155,6 +149,27 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         // saved values : things set by SetFonts, SetBorders.
         void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // ...
         // saved values : things set by SetFonts, SetBorders.
         void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // ...

+        
+        void NotifyPageChanged();
+        // call this to let wxHtmlHelpFrame know page changed
+
+    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.)


@@ -195,6 +210,9 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxButton *m_SearchButton;
         wxListBox *m_SearchList;
         wxChoice *m_SearchChoice;
         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;
 
         wxComboBox *m_Bookmarks;
         wxArrayString m_BookmarksNames, m_BookmarksPages;


@@ -213,14 +231,17 @@ 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;
+        
+        bool m_UpdateContents;

 
 

-    protected:
-        void Init(wxHtmlHelpData* data = NULL);
+#if wxUSE_PRINTING_ARCHITECTURE
+        wxHtmlEasyPrinting *m_Printer;
+#endif
+        wxHashTable *m_PagesHash;

 
         DECLARE_EVENT_TABLE()
 };
 
 
         DECLARE_EVENT_TABLE()
 };
 

-#endif
+#endif // wxUSE_HTML

 
 #endif
 
 #endif