Disable typemap for wxImage constructors

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index fca7231c10e8d357d1e7afc053da39a589afcc22..24e37d3b28ebea0c4fa60963ae19bc4b294d4d27 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -59,6 +59,7 @@
 #include "wx/spinctrl.h"
 #include "wx/dynarray.h"
 #include "wx/choicdlg.h"
 #include "wx/spinctrl.h"
 #include "wx/dynarray.h"
 #include "wx/choicdlg.h"

+#include "wx/settings.h"

 
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100
 
 // what is considered "small index"?
 #define INDEX_IS_SMALL 100


@@ -110,7 +111,11 @@ class wxHtmlHelpHashData : public wxObject
 class wxHtmlHelpHtmlWindow : public wxHtmlWindow
 {
     public:
 class wxHtmlHelpHtmlWindow : public wxHtmlWindow
 {
     public:

-        wxHtmlHelpHtmlWindow(wxHtmlHelpFrame *fr, wxWindow *parent) : wxHtmlWindow(parent), m_Frame(fr) {}
+        wxHtmlHelpHtmlWindow(wxHtmlHelpFrame *fr, wxWindow *parent)
+            : wxHtmlWindow(parent), m_Frame(fr)
+        {
+            SetStandardFonts();
+        }

 
         virtual void OnLinkClicked(const wxHtmlLinkInfo& link)
         {
 
         virtual void OnLinkClicked(const wxHtmlLinkInfo& link)
         {


@@ -120,6 +125,22 @@ class wxHtmlHelpHtmlWindow : public wxHtmlWindow
                 m_Frame->NotifyPageChanged();
         }
 
                 m_Frame->NotifyPageChanged();
         }
 

+        // Returns full location with anchor (helper)
+        static wxString GetOpenedPageWithAnchor(wxHtmlWindow *win)
+        {
+            if(!win)
+                return wxEmptyString;
+
+            wxString an = win->GetOpenedAnchor();
+            wxString pg = win->GetOpenedPage();
+            if(!an.empty())
+            {
+                pg << wxT("#");
+                pg << an;
+            }
+            return pg;
+        }
+

     private:
         wxHtmlHelpFrame *m_Frame;
 
     private:
         wxHtmlHelpFrame *m_Frame;
 


@@ -154,12 +175,12 @@ void wxHtmlHelpFrame::UpdateMergedIndex()
     size_t len = items.size();
 
     wxHtmlHelpMergedIndexItem *history[128] = {NULL};
     size_t len = items.size();
 
     wxHtmlHelpMergedIndexItem *history[128] = {NULL};

-    
+

     for (size_t i = 0; i < len; i++)
     {
         const wxHtmlHelpDataItem& item = items[i];
         wxASSERT_MSG( item.level < 128, _T("nested index entries too deep") );
     for (size_t i = 0; i < len; i++)
     {
         const wxHtmlHelpDataItem& item = items[i];
         wxASSERT_MSG( item.level < 128, _T("nested index entries too deep") );

-        
+

         if (history[item.level] &&
             history[item.level]->items[0]->name == item.name)
         {
         if (history[item.level] &&
             history[item.level]->items[0]->name == item.name)
         {


@@ -175,10 +196,10 @@ void wxHtmlHelpFrame::UpdateMergedIndex()
             mi->parent = (item.level == 0) ? NULL : history[item.level - 1];
             history[item.level] = mi;
             merged.Add(mi);
             mi->parent = (item.level == 0) ? NULL : history[item.level - 1];
             history[item.level] = mi;
             merged.Add(mi);

-        }        
+        }

     }
 }
     }
 }

-    
+

 
 //---------------------------------------------------------------------------
 // wxHtmlHelpFrame
 
 //---------------------------------------------------------------------------
 // wxHtmlHelpFrame


@@ -260,7 +281,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
 
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
 

-    m_Cfg.x = m_Cfg.y = 0;
+    m_Cfg.x = m_Cfg.y = -1;

     m_Cfg.w = 700;
     m_Cfg.h = 480;
     m_Cfg.sashpos = 240;
     m_Cfg.w = 700;
     m_Cfg.h = 480;
     m_Cfg.sashpos = 240;


@@ -298,9 +319,15 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
     m_hfStyle = style;
 
     wxImageList *ContentsImageList = new wxImageList(16, 16);
     m_hfStyle = style;
 
     wxImageList *ContentsImageList = new wxImageList(16, 16);

-    ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK, wxART_HELP_BROWSER));
-    ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER, wxART_HELP_BROWSER));
-    ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE, wxART_HELP_BROWSER));
+    ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK,
+                                                  wxART_HELP_BROWSER,
+                                                  wxSize(16, 16)));
+    ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER,
+                                                  wxART_HELP_BROWSER,
+                                                  wxSize(16, 16)));
+    ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE,
+                                                  wxART_HELP_BROWSER,
+                                                  wxSize(16, 16)));

 
     // Do the config in two steps. We read the HtmlWindow customization after we
     // create the window.
 
     // Do the config in two steps. We read the HtmlWindow customization after we
     // create the window.


@@ -409,10 +436,10 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
             wxBitmapButton *bmpbt1, *bmpbt2;
             bmpbt1 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD,
                                  wxArtProvider::GetBitmap(wxART_ADD_BOOKMARK,
             wxBitmapButton *bmpbt1, *bmpbt2;
             bmpbt1 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD,
                                  wxArtProvider::GetBitmap(wxART_ADD_BOOKMARK,

-                                                          wxART_HELP_BROWSER));
+                                                          wxART_BUTTON));

             bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE,
                                  wxArtProvider::GetBitmap(wxART_DEL_BOOKMARK,
             bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE,
                                  wxArtProvider::GetBitmap(wxART_DEL_BOOKMARK,

-                                                          wxART_HELP_BROWSER));
+                                                          wxART_BUTTON));

 #if wxUSE_TOOLTIPS
             bmpbt1->SetToolTip(_("Add current page to bookmarks"));
             bmpbt2->SetToolTip(_("Remove current page from bookmarks"));
 #if wxUSE_TOOLTIPS
             bmpbt1->SetToolTip(_("Add current page to bookmarks"));
             bmpbt2->SetToolTip(_("Remove current page from bookmarks"));


@@ -429,9 +456,16 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
         m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
                                        wxDefaultPosition, wxDefaultSize,
 
         m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
                                        wxDefaultPosition, wxDefaultSize,

+#ifdef __WXGTK20__
+                                       wxSUNKEN_BORDER |
+                                       wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT |
+                                       wxTR_NO_LINES
+#else

                                        wxSUNKEN_BORDER |
                                        wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT |
                                        wxSUNKEN_BORDER |
                                        wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT |

-                                       wxTR_LINES_AT_ROOT);
+                                       wxTR_LINES_AT_ROOT
+#endif
+                                       );

 
         m_ContentsBox->AssignImageList(ContentsImageList);
 
 
         m_ContentsBox->AssignImageList(ContentsImageList);
 


@@ -496,7 +530,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
                                       wxDefaultPosition, wxDefaultSize,
                                       wxTE_PROCESS_ENTER);
         m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE,
                                       wxDefaultPosition, wxDefaultSize,
                                       wxTE_PROCESS_ENTER);
         m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE,

-                                      wxDefaultPosition, wxDefaultSize);
+                                      wxDefaultPosition, wxSize(125,-1));

         m_SearchCaseSensitive = new wxCheckBox(dummy, wxID_ANY, _("Case sensitive"));
         m_SearchWholeWords = new wxCheckBox(dummy, wxID_ANY, _("Whole words only"));
         m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
         m_SearchCaseSensitive = new wxCheckBox(dummy, wxID_ANY, _("Case sensitive"));
         m_SearchWholeWords = new wxCheckBox(dummy, wxID_ANY, _("Whole words only"));
         m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));


@@ -560,7 +594,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 wxHtmlHelpFrame::~wxHtmlHelpFrame()
 {
     delete m_mergedIndex;
 wxHtmlHelpFrame::~wxHtmlHelpFrame()
 {
     delete m_mergedIndex;

-    
+

     // PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
     if (m_DataCreated)
         delete m_Data;
     // PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
     if (m_DataCreated)
         delete m_Data;


@@ -581,23 +615,23 @@ wxHtmlHelpFrame::~wxHtmlHelpFrame()
 void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
 {
     wxBitmap wpanelBitmap =
 void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
 {
     wxBitmap wpanelBitmap =

-        wxArtProvider::GetBitmap(wxART_HELP_SIDE_PANEL, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_HELP_SIDE_PANEL, wxART_TOOLBAR);

     wxBitmap wbackBitmap =
     wxBitmap wbackBitmap =

-        wxArtProvider::GetBitmap(wxART_GO_BACK, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_GO_BACK, wxART_TOOLBAR);

     wxBitmap wforwardBitmap =
     wxBitmap wforwardBitmap =

-        wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_TOOLBAR);

     wxBitmap wupnodeBitmap =
     wxBitmap wupnodeBitmap =

-        wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_TOOLBAR);

     wxBitmap wupBitmap =
     wxBitmap wupBitmap =

-        wxArtProvider::GetBitmap(wxART_GO_UP, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_GO_UP, wxART_TOOLBAR);

     wxBitmap wdownBitmap =
     wxBitmap wdownBitmap =

-        wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_TOOLBAR);

     wxBitmap wopenBitmap =
     wxBitmap wopenBitmap =

-        wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_TOOLBAR);

     wxBitmap wprintBitmap =
     wxBitmap wprintBitmap =

-        wxArtProvider::GetBitmap(wxART_PRINT, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_PRINT, wxART_TOOLBAR);

     wxBitmap woptionsBitmap =
     wxBitmap woptionsBitmap =

-        wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_HELP_BROWSER);
+        wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_TOOLBAR);

 
     wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() &&
                    wforwardBitmap.Ok() && wupnodeBitmap.Ok() &&
 
     wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() &&
                    wforwardBitmap.Ok() && wupnodeBitmap.Ok() &&


@@ -608,26 +642,26 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
 
 
     toolBar->AddTool(wxID_HTML_PANEL, wpanelBitmap, wxNullBitmap,
 
 
     toolBar->AddTool(wxID_HTML_PANEL, wpanelBitmap, wxNullBitmap,

-                       false, -1, -1, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Show/hide navigation panel"));
 
     toolBar->AddSeparator();
     toolBar->AddTool(wxID_HTML_BACK, wbackBitmap, wxNullBitmap,
                        _("Show/hide navigation panel"));
 
     toolBar->AddSeparator();
     toolBar->AddTool(wxID_HTML_BACK, wbackBitmap, wxNullBitmap,

-                       false, -1, -1, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Go back"));
     toolBar->AddTool(wxID_HTML_FORWARD, wforwardBitmap, wxNullBitmap,
                        _("Go back"));
     toolBar->AddTool(wxID_HTML_FORWARD, wforwardBitmap, wxNullBitmap,

-                       false, -1, -1, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Go forward"));
     toolBar->AddSeparator();
 
     toolBar->AddTool(wxID_HTML_UPNODE, wupnodeBitmap, wxNullBitmap,
                        _("Go forward"));
     toolBar->AddSeparator();
 
     toolBar->AddTool(wxID_HTML_UPNODE, wupnodeBitmap, wxNullBitmap,

-                       false, -1, -1, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Go one level up in document hierarchy"));
     toolBar->AddTool(wxID_HTML_UP, wupBitmap, wxNullBitmap,
                        _("Go one level up in document hierarchy"));
     toolBar->AddTool(wxID_HTML_UP, wupBitmap, wxNullBitmap,

-                       false, -1, -1, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Previous page"));
     toolBar->AddTool(wxID_HTML_DOWN, wdownBitmap, wxNullBitmap,
                        _("Previous page"));
     toolBar->AddTool(wxID_HTML_DOWN, wdownBitmap, wxNullBitmap,

-                       false, -1, -1, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Next page"));
 
     if ((style & wxHF_PRINT) || (style & wxHF_OPEN_FILES))
                        _("Next page"));
 
     if ((style & wxHF_PRINT) || (style & wxHF_OPEN_FILES))


@@ -635,19 +669,19 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
 
     if (style & wxHF_OPEN_FILES)
         toolBar->AddTool(wxID_HTML_OPENFILE, wopenBitmap, wxNullBitmap,
 
     if (style & wxHF_OPEN_FILES)
         toolBar->AddTool(wxID_HTML_OPENFILE, wopenBitmap, wxNullBitmap,

-                           false, -1, -1, (wxObject *) NULL,
+                           false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                            _("Open HTML document"));
 
 #if wxUSE_PRINTING_ARCHITECTURE
     if (style & wxHF_PRINT)
         toolBar->AddTool(wxID_HTML_PRINT, wprintBitmap, wxNullBitmap,
                            _("Open HTML document"));
 
 #if wxUSE_PRINTING_ARCHITECTURE
     if (style & wxHF_PRINT)
         toolBar->AddTool(wxID_HTML_PRINT, wprintBitmap, wxNullBitmap,

-                           false, -1, -1, (wxObject *) NULL,
+                           false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                            _("Print this page"));
 #endif
 
     toolBar->AddSeparator();
     toolBar->AddTool(wxID_HTML_OPTIONS, woptionsBitmap, wxNullBitmap,
                            _("Print this page"));
 #endif
 
     toolBar->AddSeparator();
     toolBar->AddTool(wxID_HTML_OPTIONS, woptionsBitmap, wxNullBitmap,

-                       false, -1, -1, (wxObject *) NULL,
+                       false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL,

                        _("Display options dialog"));
 }
 #endif //wxUSE_TOOLBAR
                        _("Display options dialog"));
 }
 #endif //wxUSE_TOOLBAR


@@ -664,7 +698,7 @@ void wxHtmlHelpFrame::SetTitleFormat(const wxString& format)
 bool wxHtmlHelpFrame::Display(const wxString& x)
 {
     wxString url = m_Data->FindPageByName(x);
 bool wxHtmlHelpFrame::Display(const wxString& x)
 {
     wxString url = m_Data->FindPageByName(x);

-    if (!url.IsEmpty())
+    if (!url.empty())

     {
         m_HtmlWin->LoadPage(url);
         NotifyPageChanged();
     {
         m_HtmlWin->LoadPage(url);
         NotifyPageChanged();


@@ -677,7 +711,7 @@ bool wxHtmlHelpFrame::Display(const wxString& x)
 bool wxHtmlHelpFrame::Display(const int id)
 {
     wxString url = m_Data->FindPageById(id);
 bool wxHtmlHelpFrame::Display(const int id)
 {
     wxString url = m_Data->FindPageById(id);

-    if (!url.IsEmpty())
+    if (!url.empty())

     {
         m_HtmlWin->LoadPage(url);
         NotifyPageChanged();
     {
         m_HtmlWin->LoadPage(url);
         NotifyPageChanged();


@@ -707,7 +741,7 @@ bool wxHtmlHelpFrame::DisplayContents()
     if (m_Data->GetBookRecArray().GetCount() > 0)
     {
         wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0];
     if (m_Data->GetBookRecArray().GetCount() > 0)
     {
         wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0];

-        if (!book.GetStart().IsEmpty())
+        if (!book.GetStart().empty())

             m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart()));
     }
 
             m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart()));
     }
 


@@ -733,7 +767,7 @@ bool wxHtmlHelpFrame::DisplayIndex()
     if (m_Data->GetBookRecArray().GetCount() > 0)
     {
         wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0];
     if (m_Data->GetBookRecArray().GetCount() > 0)
     {
         wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0];

-        if (!book.GetStart().IsEmpty())
+        if (!book.GetStart().empty())

             m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart()));
     }
 
             m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart()));
     }
 


@@ -898,7 +932,7 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword,
 
             case wxHELP_SEARCH_INDEX:
             {
 
             case wxHELP_SEARCH_INDEX:
             {

-                wxHtmlHelpMergedIndexItem* it = 
+                wxHtmlHelpMergedIndexItem* it =

                     (wxHtmlHelpMergedIndexItem*) m_IndexList->GetClientData(0);
                 if (it)
                     DisplayIndexItem(it);
                     (wxHtmlHelpMergedIndexItem*) m_IndexList->GetClientData(0);
                 if (it)
                     DisplayIndexItem(it);


@@ -921,9 +955,9 @@ void wxHtmlHelpFrame::CreateContents()
         WX_CLEAR_HASH_TABLE(*m_PagesHash);
         delete m_PagesHash;
     }
         WX_CLEAR_HASH_TABLE(*m_PagesHash);
         delete m_PagesHash;
     }

-    
+

     const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();
     const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();

-    
+

     size_t cnt = contents.size();
 
     m_PagesHash = new wxHashTable(wxKEY_STRING, 2 * cnt);
     size_t cnt = contents.size();
 
     m_PagesHash = new wxHashTable(wxKEY_STRING, 2 * cnt);


@@ -1186,11 +1220,11 @@ public:
         sizer->Add(new wxStaticText(this, wxID_ANY, _("Font size:")));
 
         sizer->Add(NormalFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
         sizer->Add(new wxStaticText(this, wxID_ANY, _("Font size:")));
 
         sizer->Add(NormalFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition,

-                      wxSize(200, -1),
+                      wxSize(200, wxDefaultCoord),

                       0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
 
         sizer->Add(FixedFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
                       0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
 
         sizer->Add(FixedFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition,

-                      wxSize(200, -1),
+                      wxSize(200, wxDefaultCoord),

                       0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
 
         sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY));
                       0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
 
         sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY));


@@ -1206,9 +1240,9 @@ public:
 
         wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL);
         wxButton *ok;
 
         wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL);
         wxButton *ok;

-        sizer2->Add(ok = new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);
+        sizer2->Add(ok = new wxButton(this, wxID_OK), 0, wxALL, 10);

         ok->SetDefault();
         ok->SetDefault();

-        sizer2->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), 0, wxALL, 10);
+        sizer2->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 10);

         topsizer->Add(sizer2, 0, wxALIGN_RIGHT);
 
         SetSizer(topsizer);
         topsizer->Add(sizer2, 0, wxALIGN_RIGHT);
 
         SetSizer(topsizer);


@@ -1335,12 +1369,11 @@ void wxHtmlHelpFrame::NotifyPageChanged()
 {
     if (m_UpdateContents && m_PagesHash)
     {
 {
     if (m_UpdateContents && m_PagesHash)
     {

-        wxString an = m_HtmlWin->GetOpenedAnchor();
-        wxHtmlHelpHashData *ha;
-        if (an.IsEmpty())
-            ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage());
-        else
-            ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage() + wxT("#") + an);
+        wxString page = wxHtmlHelpHtmlWindow::GetOpenedPageWithAnchor(m_HtmlWin);
+        wxHtmlHelpHashData *ha = NULL;
+        if (!page.empty())
+            ha = (wxHtmlHelpHashData*) m_PagesHash->Get(page);
+

         if (ha)
         {
             bool olduc = m_UpdateContents;
         if (ha)
         {
             bool olduc = m_UpdateContents;


@@ -1390,12 +1423,10 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
         case wxID_HTML_UP :
             if (m_PagesHash)
             {
         case wxID_HTML_UP :
             if (m_PagesHash)
             {

-                wxString an = m_HtmlWin->GetOpenedAnchor();
-                wxHtmlHelpHashData *ha;
-                if (an.IsEmpty())
-                    ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage());
-                else
-                    ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage() + wxT("#") + an);
+                wxString page = wxHtmlHelpHtmlWindow::GetOpenedPageWithAnchor(m_HtmlWin);
+                wxHtmlHelpHashData *ha = NULL;
+                if (!page.empty())
+                    ha = (wxHtmlHelpHashData*) m_PagesHash->Get(page);

                 if (ha && ha->m_Index > 0)
                 {
                     const wxHtmlHelpDataItem& it = m_Data->GetContentsArray()[ha->m_Index - 1];
                 if (ha && ha->m_Index > 0)
                 {
                     const wxHtmlHelpDataItem& it = m_Data->GetContentsArray()[ha->m_Index - 1];


@@ -1411,19 +1442,17 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
         case wxID_HTML_UPNODE :
             if (m_PagesHash)
             {
         case wxID_HTML_UPNODE :
             if (m_PagesHash)
             {

-                wxString an = m_HtmlWin->GetOpenedAnchor();
-                wxHtmlHelpHashData *ha;
-                if (an.IsEmpty())
-                    ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage());
-                else
-                    ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage() + wxT("#") + an);
+                wxString page = wxHtmlHelpHtmlWindow::GetOpenedPageWithAnchor(m_HtmlWin);
+                wxHtmlHelpHashData *ha = NULL;
+                if (!page.empty())
+                    ha = (wxHtmlHelpHashData*) m_PagesHash->Get(page);

                 if (ha && ha->m_Index > 0)
                 {
                 if (ha && ha->m_Index > 0)
                 {

-                    int level = 
+                    int level =

                         m_Data->GetContentsArray()[ha->m_Index].level - 1;
                     int ind = ha->m_Index - 1;
 
                         m_Data->GetContentsArray()[ha->m_Index].level - 1;
                     int ind = ha->m_Index - 1;
 

-                    const wxHtmlHelpDataItem *it = 
+                    const wxHtmlHelpDataItem *it =

                         &m_Data->GetContentsArray()[ind];
                     while (ind >= 0 && it->level != level)
                     {
                         &m_Data->GetContentsArray()[ind];
                     while (ind >= 0 && it->level != level)
                     {


@@ -1445,21 +1474,17 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
         case wxID_HTML_DOWN :
             if (m_PagesHash)
             {
         case wxID_HTML_DOWN :
             if (m_PagesHash)
             {

-                wxString an = m_HtmlWin->GetOpenedAnchor();
-                wxString adr;
-                wxHtmlHelpHashData *ha;
-
-                if (an.IsEmpty()) adr = m_HtmlWin->GetOpenedPage();
-                else adr = m_HtmlWin->GetOpenedPage() + wxT("#") + an;
-
-                ha = (wxHtmlHelpHashData*) m_PagesHash->Get(adr);
+                wxString page = wxHtmlHelpHtmlWindow::GetOpenedPageWithAnchor(m_HtmlWin);
+                wxHtmlHelpHashData *ha = NULL;
+                if (!page.empty())
+                    ha = (wxHtmlHelpHashData*) m_PagesHash->Get(page);

 
                 const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();
                 if (ha && ha->m_Index < (int)contents.size() - 1)
                 {
                     size_t idx = ha->m_Index + 1;
 
 
                 const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();
                 if (ha && ha->m_Index < (int)contents.size() - 1)
                 {
                     size_t idx = ha->m_Index + 1;
 

-                    while (contents[idx].GetFullPath() == adr) idx++;
+                    while (contents[idx].GetFullPath() == page) idx++;

 
                     if (!contents[idx].page.empty())
                     {
 
                     if (!contents[idx].page.empty())
                     {


@@ -1558,7 +1583,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
                                             filemask,
                                             wxOPEN | wxFILE_MUST_EXIST,
                                             this);
                                             filemask,
                                             wxOPEN | wxFILE_MUST_EXIST,
                                             this);

-                if (!s.IsEmpty())
+                if (!s.empty())

                 {
                     wxString ext = s.Right(4).Lower();
                     if (ext == _T(".zip") || ext == _T(".htb") ||
                 {
                     wxString ext = s.Right(4).Lower();
                     if (ext == _T(".zip") || ext == _T(".htb") ||


@@ -1601,7 +1626,7 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
 
 void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
 {

-    wxHtmlHelpMergedIndexItem *it = (wxHtmlHelpMergedIndexItem*) 
+    wxHtmlHelpMergedIndexItem *it = (wxHtmlHelpMergedIndexItem*)

         m_IndexList->GetClientData(m_IndexList->GetSelection());
     if (it)
         DisplayIndexItem(it);
         m_IndexList->GetClientData(m_IndexList->GetSelection());
     if (it)
         DisplayIndexItem(it);


@@ -1649,7 +1674,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
                 wxHtmlHelpMergedIndexItem *parent = index[i].parent;
                 while (parent)
                 {
                 wxHtmlHelpMergedIndexItem *parent = index[i].parent;
                 while (parent)
                 {

-                    if (pos == 0 || 
+                    if (pos == 0 ||

                         (index.Index(*(wxHtmlHelpMergedIndexItem*)m_IndexList->GetClientData(pos-1))) < index.Index(*parent))
                     {
                         m_IndexList->Insert(parent->name,
                         (index.Index(*(wxHtmlHelpMergedIndexItem*)m_IndexList->GetClientData(pos-1))) < index.Index(*parent))
                     {
                         m_IndexList->Insert(parent->name,


@@ -1658,6 +1683,19 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
                     }
                     else break;
                 }
                     }
                     else break;
                 }

+
+                // finally, it the item we just added is itself a parent for
+                // other items, show them as well, because they are refinements
+                // of the displayed index entry (i.e. it is implicitly contained
+                // in them: "foo" with parent "bar" reads as "bar, foo"):
+                int level = index[i].items[0]->level;
+                i++;
+                while (i < cnt && index[i].items[0]->level > level)
+                {
+                    m_IndexList->Append(index[i].name, (char*)(&index[i]));
+                    i++;
+                }
+                i--;

             }
         }
 
             }
         }