implemented nested index entries and index entries pointing to multiple documents...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 6429c3147a4d958656217e534f1d4e301d8075a5..ca8415ab25f0cf1041af663079b01aca1057e155 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -70,6 +70,8 @@ struct wxHtmlHelpFrameCfg
     bool navig_on;
 };
 
     bool navig_on;
 };
 

+class wxHtmlHelpMergedIndexItem;
+class wxHtmlHelpMergedIndex;

 
 class WXDLLIMPEXP_CORE wxHelpControllerBase;
 
 
 class WXDLLIMPEXP_CORE wxHelpControllerBase;
 


@@ -155,6 +157,10 @@ protected:
     // Add books to search choice panel
     void CreateSearch();
 
     // Add books to search choice panel
     void CreateSearch();
 

+    // Updates "merged index" structure that combines indexes of all books
+    // into better searchable structure
+    void UpdateMergedIndex();
+

     // Add custom buttons to toolbar
     virtual void AddToolbarButtons(wxToolBar *toolBar, int style);
 
     // Add custom buttons to toolbar
     virtual void AddToolbarButtons(wxToolBar *toolBar, int style);
 


@@ -234,6 +240,10 @@ protected:
 
     int m_hfStyle;
 
 
     int m_hfStyle;
 

+private:
+    void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it);
+    wxHtmlHelpMergedIndex *m_mergedIndex;
+    

     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxHtmlHelpFrame)
 };