X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96873b794c62afc3fd6f2db5859bc20675fd2c51..0281278534339322516fa6133ed4df925c2156be:/src/html/helpfrm.cpp diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index e188cb800d..5858f92b08 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -9,8 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma implementation "helpfrm.h" #endif // For compilers that support precompilation, includes "wx.h" @@ -28,7 +28,6 @@ #include "wx/log.h" #include "wx/object.h" - #include "wx/layout.h" #include "wx/sizer.h" #include "wx/bmpbuttn.h" @@ -36,6 +35,11 @@ #include "wx/radiobox.h" #endif // WXPRECOMP +#ifdef __WXMAC__ + #include "wx/menu.h" + #include "wx/msgdlg.h" +#endif + #include "wx/html/helpfrm.h" #include "wx/html/helpctrl.h" #include "wx/textctrl.h" @@ -51,28 +55,11 @@ #include "wx/fontenum.h" #include "wx/stream.h" #include "wx/filedlg.h" - -// Bitmaps: - -#ifndef __WXMSW__ -#include "bitmaps/wpanel.xpm" -#include "bitmaps/wback.xpm" -#include "bitmaps/wforward.xpm" -#include "bitmaps/wbook.xpm" -#include "bitmaps/woptions.xpm" -#include "bitmaps/wfolder.xpm" -#include "bitmaps/wpage.xpm" -#include "bitmaps/whelp.xpm" -#include "bitmaps/whlproot.xpm" -#include "bitmaps/wbkadd.xpm" -#include "bitmaps/wbkdel.xpm" -#include "bitmaps/wup.xpm" -#include "bitmaps/wupnode.xpm" -#include "bitmaps/wdown.xpm" -#include "bitmaps/wopen.xpm" -#include "bitmaps/wprint.xpm" -#endif - +#include "wx/artprov.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 @@ -124,19 +111,79 @@ class wxHtmlHelpHashData : public wxObject 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) { wxHtmlWindow::OnLinkClicked(link); - m_Frame->NotifyPageChanged(); + const wxMouseEvent *e = link.GetEvent(); + if (e == NULL || e->LeftUp()) + m_Frame->NotifyPageChanged(); } private: wxHtmlHelpFrame *m_Frame; + + DECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow) }; +//--------------------------------------------------------------------------- +// wxHtmlHelpFrame::m_mergedIndex +//--------------------------------------------------------------------------- + +WX_DEFINE_ARRAY_PTR(const wxHtmlHelpDataItem*, wxHtmlHelpDataItemPtrArray); + +struct wxHtmlHelpMergedIndexItem +{ + wxHtmlHelpMergedIndexItem *parent; + wxString name; + wxHtmlHelpDataItemPtrArray items; +}; + +WX_DECLARE_OBJARRAY(wxHtmlHelpMergedIndexItem, wxHtmlHelpMergedIndex); +#include "wx/arrimpl.cpp" +WX_DEFINE_OBJARRAY(wxHtmlHelpMergedIndex) + +void wxHtmlHelpFrame::UpdateMergedIndex() +{ + delete m_mergedIndex; + m_mergedIndex = new wxHtmlHelpMergedIndex; + wxHtmlHelpMergedIndex& merged = *m_mergedIndex; + + const wxHtmlHelpDataItems& items = m_Data->GetIndexArray(); + 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") ); + + if (history[item.level] && + history[item.level]->items[0]->name == item.name) + { + // same index entry as previous one, update list of items + history[item.level]->items.Add(&item); + } + else + { + // new index entry + wxHtmlHelpMergedIndexItem *mi = new wxHtmlHelpMergedIndexItem(); + mi->name = item.GetIndentedName(); + mi->items.Add(&item); + mi->parent = (item.level == 0) ? NULL : history[item.level - 1]; + history[item.level] = mi; + merged.Add(mi); + } + } +} + //--------------------------------------------------------------------------- // wxHtmlHelpFrame @@ -188,11 +235,11 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data) if (data) { m_Data = data; - m_DataCreated = FALSE; + m_DataCreated = false; } else { m_Data = new wxHtmlHelpData(); - m_DataCreated = TRUE; + m_DataCreated = true; } m_ContentsBox = NULL; @@ -207,11 +254,14 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data) m_IndexCountInfo = NULL; m_Splitter = NULL; m_NavigPan = NULL; + m_NavigNotebook = NULL; m_HtmlWin = NULL; m_Bookmarks = NULL; m_SearchCaseSensitive = NULL; m_SearchWholeWords = NULL; + m_mergedIndex = NULL; + m_Config = NULL; m_ConfigRoot = wxEmptyString; @@ -219,18 +269,22 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data) m_Cfg.w = 700; m_Cfg.h = 480; m_Cfg.sashpos = 240; - m_Cfg.navig_on = TRUE; + m_Cfg.navig_on = true; m_NormalFonts = m_FixedFonts = NULL; m_NormalFace = m_FixedFace = wxEmptyString; - m_FontSize = 1; +#ifdef __WXMSW__ + m_FontSize = 10; +#else + m_FontSize = 14; +#endif #if wxUSE_PRINTING_ARCHITECTURE m_Printer = NULL; #endif m_PagesHash = NULL; - m_UpdateContents = TRUE; + m_UpdateContents = true; m_helpController = (wxHelpControllerBase*) NULL; } @@ -249,26 +303,57 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, m_hfStyle = style; wxImageList *ContentsImageList = new wxImageList(16, 16); - ContentsImageList->Add(wxICON(wbook)); - ContentsImageList->Add(wxICON(wfolder)); - ContentsImageList->Add(wxICON(wpage)); - ContentsImageList->Add(wxICON(whlproot)); + 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. if (m_Config) ReadCustomization(m_Config, m_ConfigRoot); - wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h), wxDEFAULT_FRAME_STYLE, "wxHtmlHelp"); + wxFrame::Create(parent, id, _("Help"), + wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h), + wxDEFAULT_FRAME_STYLE, wxT("wxHtmlHelp")); GetPosition(&m_Cfg.x, &m_Cfg.y); - SetIcon(wxICON(whelp)); + SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_HELP_BROWSER)); + + // On the Mac, each modeless frame must have a menubar. + // TODO: add more menu items, and perhaps add a style to show + // the menubar: compulsory on the Mac, optional elsewhere. +#ifdef __WXMAC__ + wxMenuBar* menuBar = new wxMenuBar; + + wxMenu* fileMenu = new wxMenu; + fileMenu->Append(wxID_HTML_OPENFILE, _("&Open...")); + fileMenu->AppendSeparator(); + fileMenu->Append(wxID_CLOSE, _("&Close")); + + wxMenu* helpMenu = new wxMenu; + helpMenu->Append(wxID_ABOUT, _("&About...")); + // Ensures we don't get an empty help menu + helpMenu->Append(wxID_HELP_CONTENTS, _("&About...")); + + menuBar->Append(fileMenu,_("&File")); + menuBar->Append(helpMenu,_("&Help")); + SetMenuBar(menuBar); +#endif int notebook_page = 0; +#if wxUSE_STATUSBAR CreateStatusBar(); +#endif // wxUSE_STATUSBAR +#if wxUSE_TOOLBAR // toolbar? if (style & (wxHF_TOOLBAR | wxHF_FLAT_TOOLBAR)) { @@ -279,6 +364,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, AddToolbarButtons(toolBar, style); toolBar->Realize(); } +#endif //wxUSE_TOOLBAR + + wxSizer *navigSizer = NULL; if (style & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH)) { @@ -287,8 +375,14 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, m_Splitter = new wxSplitterWindow(this); m_HtmlWin = new wxHtmlHelpHtmlWindow(this, m_Splitter); - m_NavigPan = new wxNotebook(m_Splitter, wxID_HTML_NOTEBOOK, - wxDefaultPosition, wxDefaultSize); + m_NavigPan = new wxPanel(m_Splitter, wxID_ANY); + m_NavigNotebook = new wxNotebook(m_NavigPan, wxID_HTML_NOTEBOOK, + wxDefaultPosition, wxDefaultSize); + + navigSizer = new wxBoxSizer(wxVERTICAL); + navigSizer->Add(m_NavigNotebook, 1, wxEXPAND); + + m_NavigPan->SetSizer(navigSizer); } else { // only html window, no notebook with index,contents etc @@ -296,259 +390,225 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, } m_HtmlWin->SetRelatedFrame(this, m_TitleFormat); +#if wxUSE_STATUSBAR m_HtmlWin->SetRelatedStatusBar(0); - if (m_Config) +#endif // wxUSE_STATUSBAR + if ( m_Config ) m_HtmlWin->ReadCustomization(m_Config, m_ConfigRoot); // contents tree panel? - if (style & wxHF_CONTENTS) + if ( style & wxHF_CONTENTS ) { - wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE); - - if (style & wxHF_BOOKMARKS) - { - wxLayoutConstraints *b1 = new wxLayoutConstraints; - wxBitmapButton *bmpbt = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxDefaultPosition, wxSize(20,20)); + wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE); + wxSizer *topsizer = new wxBoxSizer(wxVERTICAL); - b1->top.SameAs (dummy, wxTop, 10); - b1->right.SameAs (dummy, wxRight, 10); - b1->height.AsIs(); - b1->width.AsIs(); - bmpbt->SetConstraints(b1); + topsizer->Add(0, 10); - wxLayoutConstraints *b2 = new wxLayoutConstraints; - wxBitmapButton *bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD, wxBITMAP(wbkadd), wxDefaultPosition, wxSize(20,20)); + dummy->SetSizer(topsizer); - b2->top.SameAs (dummy, wxTop, 10); - b2->right.LeftOf (bmpbt, 2); - b2->height.AsIs(); - b2->width.AsIs(); - bmpbt2->SetConstraints(b2); - -#if wxUSE_TOOLTIPS - bmpbt->SetToolTip(_("Remove current page from bookmarks")); - bmpbt2->SetToolTip(_("Add current page to bookmarks")); -#endif //wxUSE_TOOLTIPS - - wxLayoutConstraints *b3 = new wxLayoutConstraints; - m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST, wxEmptyString, - wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY | wxCB_SORT); + if ( style & wxHF_BOOKMARKS ) + { + m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST, + wxEmptyString, + wxDefaultPosition, wxDefaultSize, + 0, NULL, wxCB_READONLY | wxCB_SORT); m_Bookmarks->Append(_("(bookmarks)")); for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++) m_Bookmarks->Append(m_BookmarksNames[i]); m_Bookmarks->SetSelection(0); - b3->centreY.SameAs (bmpbt2, wxCentreY); - b3->left.SameAs (dummy, wxLeft, 10); - b3->right.LeftOf (bmpbt2, 5); - b3->height.AsIs(); - m_Bookmarks->SetConstraints(b3); + wxBitmapButton *bmpbt1, *bmpbt2; + bmpbt1 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD, + wxArtProvider::GetBitmap(wxART_ADD_BOOKMARK, + wxART_BUTTON)); + bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, + wxArtProvider::GetBitmap(wxART_DEL_BOOKMARK, + wxART_BUTTON)); +#if wxUSE_TOOLTIPS + bmpbt1->SetToolTip(_("Add current page to bookmarks")); + bmpbt2->SetToolTip(_("Remove current page from bookmarks")); +#endif // wxUSE_TOOLTIPS + wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); - wxLayoutConstraints *b4 = new wxLayoutConstraints; - m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL, - wxDefaultPosition, wxDefaultSize, - wxSUNKEN_BORDER | - wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT); - m_ContentsBox->AssignImageList(ContentsImageList); + sizer->Add(m_Bookmarks, 1, wxALIGN_CENTRE_VERTICAL | wxRIGHT, 5); + sizer->Add(bmpbt1, 0, wxALIGN_CENTRE_VERTICAL | wxRIGHT, 2); + sizer->Add(bmpbt2, 0, wxALIGN_CENTRE_VERTICAL, 0); - b4->top.Below (m_Bookmarks, 10); - b4->left.SameAs (dummy, wxLeft, 0); - b4->right.SameAs (dummy, wxRight, 0); - b4->bottom.SameAs (dummy, wxBottom, 0); - m_ContentsBox->SetConstraints(b4); + topsizer->Add(sizer, 0, wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT, 10); + } - dummy->SetAutoLayout(TRUE); - dummy->Layout(); + m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL, + wxDefaultPosition, wxDefaultSize, + wxSUNKEN_BORDER | + wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT | + wxTR_LINES_AT_ROOT); - m_NavigPan->AddPage(dummy, _("Contents")); - } + m_ContentsBox->AssignImageList(ContentsImageList); - else - { - m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL, - wxDefaultPosition, wxDefaultSize, - wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxSUNKEN_BORDER); - m_ContentsBox->AssignImageList(ContentsImageList); - m_NavigPan->AddPage(m_ContentsBox, _("Contents")); - } + topsizer->Add(m_ContentsBox, 1, + wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT, + 2); + m_NavigNotebook->AddPage(dummy, _("Contents")); m_ContentsPage = notebook_page++; } // index listbox panel? - if (style & wxHF_INDEX) + if ( style & wxHF_INDEX ) { - wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE); - - wxLayoutConstraints *b1 = new wxLayoutConstraints; - m_IndexText = new wxTextCtrl(dummy, wxID_HTML_INDEXTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - b1->top.SameAs (dummy, wxTop, 10); - b1->left.SameAs (dummy, wxLeft, 10); - b1->right.SameAs (dummy, wxRight, 10); - b1->height.AsIs(); - m_IndexText->SetConstraints(b1); - - wxLayoutConstraints *b4 = new wxLayoutConstraints; - m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL, _("Show all")); - - b4->top.Below (m_IndexText, 10); - b4->right.SameAs (dummy, wxRight, 10); - b4->width.AsIs(); - b4->height.AsIs(); - m_IndexButtonAll->SetConstraints(b4); - - wxLayoutConstraints *b2 = new wxLayoutConstraints; + wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE); + wxSizer *topsizer = new wxBoxSizer(wxVERTICAL); + + dummy->SetSizer(topsizer); + + m_IndexText = new wxTextCtrl(dummy, wxID_HTML_INDEXTEXT, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxTE_PROCESS_ENTER); m_IndexButton = new wxButton(dummy, wxID_HTML_INDEXBUTTON, _("Find")); - b2->top.Below (m_IndexText, 10); - b2->right.LeftOf (m_IndexButtonAll, 10); - b2->width.AsIs(); - b2->height.AsIs(); - m_IndexButton->SetConstraints(b2); - - wxLayoutConstraints *b5 = new wxLayoutConstraints; - m_IndexCountInfo = new wxStaticText(dummy, wxID_HTML_COUNTINFO, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxST_NO_AUTORESIZE); - - b5->top.Below (m_IndexButton, 5); - b5->right.SameAs (dummy, wxRight, 10); - b5->left.SameAs (dummy, wxLeft, 10); - b5->height.AsIs(); - m_IndexCountInfo->SetConstraints(b5); - - wxLayoutConstraints *b3 = new wxLayoutConstraints; - m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE); - b3->top.Below (m_IndexCountInfo, 5); - b3->left.SameAs (dummy, wxLeft, 0); - b3->right.SameAs (dummy, wxRight, 0); - b3->bottom.SameAs (dummy, wxBottom, 0); - m_IndexList->SetConstraints(b3); + m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL, + _("Show all")); + m_IndexCountInfo = new wxStaticText(dummy, wxID_HTML_COUNTINFO, + wxEmptyString, wxDefaultPosition, + wxDefaultSize, + wxALIGN_RIGHT | wxST_NO_AUTORESIZE); + m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST, + wxDefaultPosition, wxDefaultSize, + 0, NULL, wxLB_SINGLE); #if wxUSE_TOOLTIPS - m_IndexButtonAll->SetToolTip(_("Show all items in index")); m_IndexButton->SetToolTip(_("Display all index items that contain given substring. Search is case insensitive.")); + m_IndexButtonAll->SetToolTip(_("Show all items in index")); #endif //wxUSE_TOOLTIPS - dummy->SetAutoLayout(TRUE); - dummy->Layout(); + topsizer->Add(m_IndexText, 0, wxEXPAND | wxALL, 10); + wxSizer *btsizer = new wxBoxSizer(wxHORIZONTAL); + btsizer->Add(m_IndexButton, 0, wxRIGHT, 2); + btsizer->Add(m_IndexButtonAll); + topsizer->Add(btsizer, 0, + wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 10); + topsizer->Add(m_IndexCountInfo, 0, wxEXPAND | wxLEFT | wxRIGHT, 2); + topsizer->Add(m_IndexList, 1, wxEXPAND | wxALL, 2); - m_NavigPan->AddPage(dummy, _("Index")); + m_NavigNotebook->AddPage(dummy, _("Index")); m_IndexPage = notebook_page++; } // search list panel? - if (style & wxHF_SEARCH) + if ( style & wxHF_SEARCH ) { - wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE); - - wxLayoutConstraints *b1 = new wxLayoutConstraints; - m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); - b1->top.SameAs (dummy, wxTop, 10); - b1->left.SameAs (dummy, wxLeft, 10); - b1->right.SameAs (dummy, wxRight, 10); - b1->height.AsIs(); - m_SearchText->SetConstraints(b1); - - wxLayoutConstraints *b4 = new wxLayoutConstraints; - m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE, wxDefaultPosition, - wxDefaultSize); - b4->top.Below (m_SearchText, 10); - b4->left.SameAs (dummy, wxLeft, 10); - b4->right.SameAs (dummy, wxRight, 10); - b4->height.AsIs(); - m_SearchChoice->SetConstraints(b4); - - wxLayoutConstraints *b5 = new wxLayoutConstraints; - m_SearchCaseSensitive = new wxCheckBox(dummy, -1, _("Case sensitive")); - b5->top.Below (m_SearchChoice, 10); - b5->left.SameAs (dummy, wxLeft, 10); - b5->width.AsIs(); - b5->height.AsIs (); - m_SearchCaseSensitive->SetConstraints(b5); - - wxLayoutConstraints *b6 = new wxLayoutConstraints; - m_SearchWholeWords = new wxCheckBox(dummy, -1, _("Whole words only")); - b6->top.Below (m_SearchCaseSensitive, 0); - b6->left.SameAs (dummy, wxLeft, 10); - b6->width.AsIs(); - b6->height.AsIs (); - m_SearchWholeWords->SetConstraints(b6); - - wxLayoutConstraints *b2 = new wxLayoutConstraints; + wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE); + wxSizer *sizer = new wxBoxSizer(wxVERTICAL); + + dummy->SetSizer(sizer); + + m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT, + wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxTE_PROCESS_ENTER); + m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE, + wxDefaultPosition, wxDefaultSize); + 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")); #if wxUSE_TOOLTIPS m_SearchButton->SetToolTip(_("Search contents of help book(s) for all occurences of the text you typed above")); #endif //wxUSE_TOOLTIPS - b2->top.Below (m_SearchWholeWords, 0); - b2->right.SameAs (dummy, wxRight, 10); - b2->width.AsIs(); - b2->height.AsIs(); - m_SearchButton->SetConstraints(b2); - - wxLayoutConstraints *b3 = new wxLayoutConstraints; - m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE); - b3->top.Below (m_SearchButton, 10); - b3->left.SameAs (dummy, wxLeft, 0); - b3->right.SameAs (dummy, wxRight, 0); - b3->bottom.SameAs (dummy, wxBottom, 0); - m_SearchList->SetConstraints(b3); - - dummy->SetAutoLayout(TRUE); - dummy->Layout(); - m_NavigPan->AddPage(dummy, _("Search")); - m_SearchPage = notebook_page++; + m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, + wxDefaultPosition, wxDefaultSize, + 0, NULL, wxLB_SINGLE); + + sizer->Add(m_SearchText, 0, wxEXPAND | wxALL, 10); + sizer->Add(m_SearchChoice, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 10); + sizer->Add(m_SearchCaseSensitive, 0, wxLEFT | wxRIGHT, 10); + sizer->Add(m_SearchWholeWords, 0, wxLEFT | wxRIGHT, 10); + sizer->Add(m_SearchButton, 0, wxALL | wxALIGN_RIGHT, 8); + sizer->Add(m_SearchList, 1, wxALL | wxEXPAND, 2); + + m_NavigNotebook->AddPage(dummy, _("Search")); + m_SearchPage = notebook_page; } - m_HtmlWin->Show(TRUE); + + m_HtmlWin->Show(); RefreshLists(); + if ( navigSizer ) + { + navigSizer->SetSizeHints(m_NavigPan); + m_NavigPan->Layout(); + } + // showtime - if (m_NavigPan && m_Splitter) + if ( m_NavigPan && m_Splitter ) { m_Splitter->SetMinimumPaneSize(20); - if (m_Cfg.navig_on) - m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); - else - { + if ( m_Cfg.navig_on ) m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); - m_Splitter->Unsplit(); - } - if (m_Cfg.navig_on) + if ( m_Cfg.navig_on ) { - m_NavigPan->Show(TRUE); + m_NavigPan->Show(); m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); } else { - m_NavigPan->Show(FALSE); + m_NavigPan->Show(false); m_Splitter->Initialize(m_HtmlWin); } } - return TRUE; + + // Reduce flicker by updating the splitter pane sizes before the + // frame is shown + wxSizeEvent sizeEvent(GetSize(), GetId()); + ProcessEvent(sizeEvent); + + m_Splitter->UpdateSize(); + + return true; } wxHtmlHelpFrame::~wxHtmlHelpFrame() { + delete m_mergedIndex; + // PopEventHandler(); // wxhtmlhelpcontroller (not any more!) if (m_DataCreated) delete m_Data; if (m_NormalFonts) delete m_NormalFonts; if (m_FixedFonts) delete m_FixedFonts; - if (m_PagesHash) delete m_PagesHash; + if (m_PagesHash) + { + WX_CLEAR_HASH_TABLE(*m_PagesHash); + delete m_PagesHash; + } +#if wxUSE_PRINTING_ARCHITECTURE + if (m_Printer) delete m_Printer; +#endif } +#if wxUSE_TOOLBAR void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style) { - wxBitmap wpanelBitmap = wxBITMAP(wpanel); - wxBitmap wbackBitmap = wxBITMAP(wback); - wxBitmap wforwardBitmap = wxBITMAP(wforward); - wxBitmap wupnodeBitmap = wxBITMAP(wupnode); - wxBitmap wupBitmap = wxBITMAP(wup); - wxBitmap wdownBitmap = wxBITMAP(wdown); - wxBitmap wopenBitmap = wxBITMAP(wopen); - wxBitmap wprintBitmap = wxBITMAP(wprint); - wxBitmap woptionsBitmap = wxBITMAP(woptions); + wxBitmap wpanelBitmap = + wxArtProvider::GetBitmap(wxART_HELP_SIDE_PANEL, wxART_TOOLBAR); + wxBitmap wbackBitmap = + wxArtProvider::GetBitmap(wxART_GO_BACK, wxART_TOOLBAR); + wxBitmap wforwardBitmap = + wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_TOOLBAR); + wxBitmap wupnodeBitmap = + wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_TOOLBAR); + wxBitmap wupBitmap = + wxArtProvider::GetBitmap(wxART_GO_UP, wxART_TOOLBAR); + wxBitmap wdownBitmap = + wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_TOOLBAR); + wxBitmap wopenBitmap = + wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_TOOLBAR); + wxBitmap wprintBitmap = + wxArtProvider::GetBitmap(wxART_PRINT, wxART_TOOLBAR); + wxBitmap woptionsBitmap = + wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_TOOLBAR); wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() && wforwardBitmap.Ok() && wupnodeBitmap.Ok() && @@ -559,26 +619,26 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style) 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, - FALSE, -1, -1, (wxObject *) NULL, + false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, _("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, - FALSE, -1, -1, (wxObject *) NULL, + false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, _("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, - FALSE, -1, -1, (wxObject *) NULL, + false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, _("Next page")); if ((style & wxHF_PRINT) || (style & wxHF_OPEN_FILES)) @@ -586,21 +646,22 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style) 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, - FALSE, -1, -1, (wxObject *) NULL, + false, wxDefaultCoord, wxDefaultCoord, (wxObject *) NULL, _("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 void wxHtmlHelpFrame::SetTitleFormat(const wxString& format) @@ -618,9 +679,10 @@ bool wxHtmlHelpFrame::Display(const wxString& x) { m_HtmlWin->LoadPage(url); NotifyPageChanged(); - return TRUE; + return true; } - return FALSE; + + return false; } bool wxHtmlHelpFrame::Display(const int id) @@ -630,9 +692,10 @@ bool wxHtmlHelpFrame::Display(const int id) { m_HtmlWin->LoadPage(url); NotifyPageChanged(); - return TRUE; + return true; } - return FALSE; + + return false; } @@ -640,22 +703,26 @@ bool wxHtmlHelpFrame::Display(const int id) bool wxHtmlHelpFrame::DisplayContents() { if (! m_ContentsBox) - return FALSE; + return false; + if (!m_Splitter->IsSplit()) { - m_NavigPan->Show(TRUE); - m_HtmlWin->Show(TRUE); + m_NavigPan->Show(); + m_HtmlWin->Show(); m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); - m_Cfg.navig_on = TRUE; + m_Cfg.navig_on = true; } - m_NavigPan->SetSelection(0); + + m_NavigNotebook->SetSelection(0); + if (m_Data->GetBookRecArray().GetCount() > 0) { wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0]; if (!book.GetStart().IsEmpty()) m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart())); } - return TRUE; + + return true; } @@ -663,82 +730,196 @@ bool wxHtmlHelpFrame::DisplayContents() bool wxHtmlHelpFrame::DisplayIndex() { if (! m_IndexList) - return FALSE; + return false; + if (!m_Splitter->IsSplit()) { - m_NavigPan->Show(TRUE); - m_HtmlWin->Show(TRUE); + m_NavigPan->Show(); + m_HtmlWin->Show(); m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); } - m_NavigPan->SetSelection(1); + + m_NavigNotebook->SetSelection(1); + if (m_Data->GetBookRecArray().GetCount() > 0) { wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0]; if (!book.GetStart().IsEmpty()) m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart())); } - return TRUE; + + return true; } +void wxHtmlHelpFrame::DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it) +{ + if (it->items.size() == 1) + { + if (!it->items[0]->page.empty()) + { + m_HtmlWin->LoadPage(it->items[0]->GetFullPath()); + NotifyPageChanged(); + } + } + else + { + wxBusyCursor busy_cursor; + + // more pages associated with this index item -- let the user choose + // which one she/he wants from a list: + wxArrayString arr; + size_t len = it->items.size(); + for (size_t i = 0; i < len; i++) + { + wxString page = it->items[i]->page; + // try to find page's title in contents: + const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray(); + size_t clen = contents.size(); + for (size_t j = 0; j < clen; j++) + { + if (contents[j].page == page) + { + page = contents[j].name; + break; + } + } + arr.push_back(page); + } + + wxSingleChoiceDialog dlg(this, + _("Please choose the page to display:"), + _("Help Topics"), + arr, NULL, wxCHOICEDLG_STYLE & ~wxCENTRE); + if (dlg.ShowModal() == wxID_OK) + { + m_HtmlWin->LoadPage(it->items[dlg.GetSelection()]->GetFullPath()); + NotifyPageChanged(); + } + } +} -bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword) +bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword, + wxHelpSearchMode mode) { - if (! (m_SearchList && m_SearchButton && m_SearchText && m_SearchChoice)) - return FALSE; + if (mode == wxHELP_SEARCH_ALL) + { + if ( !(m_SearchList && + m_SearchButton && m_SearchText && m_SearchChoice) ) + return false; + } + else if (mode == wxHELP_SEARCH_INDEX) + { + if ( !(m_IndexList && + m_IndexButton && m_IndexButtonAll && m_IndexText) ) + return false; + } - int foundcnt = 0, curi; + int foundcnt = 0; wxString foundstr; wxString book = wxEmptyString; if (!m_Splitter->IsSplit()) { - m_NavigPan->Show(TRUE); - m_HtmlWin->Show(TRUE); + m_NavigPan->Show(); + m_HtmlWin->Show(); m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); } - m_NavigPan->SetSelection(m_SearchPage); - m_SearchList->Clear(); - m_SearchText->SetValue(keyword); - m_SearchButton->Enable(FALSE); - - if (m_SearchChoice->GetSelection() != 0) - book = m_SearchChoice->GetStringSelection(); - wxHtmlSearchStatus status(m_Data, keyword, - m_SearchCaseSensitive->GetValue(), m_SearchWholeWords->GetValue(), - book); - - wxProgressDialog progress(_("Searching..."), _("No matching page found yet"), - status.GetMaxIndex(), this, - wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE); - - while (status.IsActive()) + if (mode == wxHELP_SEARCH_ALL) { - curi = status.GetCurIndex(); - if (curi % 32 == 0 && progress.Update(curi) == FALSE) - break; - if (status.Search()) + m_NavigNotebook->SetSelection(m_SearchPage); + m_SearchList->Clear(); + m_SearchText->SetValue(keyword); + m_SearchButton->Disable(); + + if (m_SearchChoice->GetSelection() != 0) + book = m_SearchChoice->GetStringSelection(); + + wxHtmlSearchStatus status(m_Data, keyword, + m_SearchCaseSensitive->GetValue(), + m_SearchWholeWords->GetValue(), + book); + +#if wxUSE_PROGRESSDLG + wxProgressDialog progress(_("Searching..."), + _("No matching page found yet"), + status.GetMaxIndex(), this, + wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE); +#endif + + int curi; + while (status.IsActive()) { - foundstr.Printf(_("Found %i matches"), ++foundcnt); - progress.Update(status.GetCurIndex(), foundstr); - m_SearchList->Append(status.GetName(), status.GetContentsItem()); + curi = status.GetCurIndex(); + if (curi % 32 == 0 +#if wxUSE_PROGRESSDLG + && !progress.Update(curi) +#endif + ) + break; + if (status.Search()) + { + foundstr.Printf(_("Found %i matches"), ++foundcnt); +#if wxUSE_PROGRESSDLG + progress.Update(status.GetCurIndex(), foundstr); +#endif + m_SearchList->Append(status.GetName(), (void*)status.GetCurItem()); + } } + + m_SearchButton->Enable(); + m_SearchText->SetSelection(0, keyword.Length()); + m_SearchText->SetFocus(); + } + else if (mode == wxHELP_SEARCH_INDEX) + { + m_NavigNotebook->SetSelection(m_IndexPage); + m_IndexList->Clear(); + m_IndexButton->Disable(); + m_IndexButtonAll->Disable(); + m_IndexText->SetValue(keyword); + + wxCommandEvent dummy; + OnIndexFind(dummy); // what a hack... + m_IndexButton->Enable(); + m_IndexButtonAll->Enable(); + foundcnt = m_IndexList->GetCount(); } - m_SearchButton->Enable(TRUE); - m_SearchText->SetSelection(0, keyword.Length()); - m_SearchText->SetFocus(); if (foundcnt) { - wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0); - if (it) + switch ( mode ) { - m_HtmlWin->LoadPage(it->GetFullPath()); - NotifyPageChanged(); + default: + wxFAIL_MSG( _T("unknown help search mode") ); + // fall back + + case wxHELP_SEARCH_ALL: + { + wxHtmlHelpDataItem *it = + (wxHtmlHelpDataItem*) m_SearchList->GetClientData(0); + if (it) + { + m_HtmlWin->LoadPage(it->GetFullPath()); + NotifyPageChanged(); + } + break; + } + + case wxHELP_SEARCH_INDEX: + { + wxHtmlHelpMergedIndexItem* it = + (wxHtmlHelpMergedIndexItem*) m_IndexList->GetClientData(0); + if (it) + DisplayIndexItem(it); + break; + } } + } - return (foundcnt > 0); + + return foundcnt > 0; } void wxHtmlHelpFrame::CreateContents() @@ -746,17 +927,17 @@ void wxHtmlHelpFrame::CreateContents() if (! m_ContentsBox) return ; - m_ContentsBox->Clear(); + if (m_PagesHash) + { + WX_CLEAR_HASH_TABLE(*m_PagesHash); + delete m_PagesHash; + } - if (m_PagesHash) delete m_PagesHash; - m_PagesHash = new wxHashTable(wxKEY_STRING, 2 * m_Data->GetContentsCnt()); - m_PagesHash->DeleteContents(TRUE); + const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray(); - int cnt = m_Data->GetContentsCnt(); - int i; - size_t booksCnt = m_Data->GetBookRecArray().GetCount(); + size_t cnt = contents.size(); - wxHtmlContentsItem *it; + m_PagesHash = new wxHashTable(wxKEY_STRING, 2 * cnt); const int MAX_ROOTS = 64; wxTreeItemId roots[MAX_ROOTS]; @@ -768,82 +949,59 @@ void wxHtmlHelpFrame::CreateContents() // set its icon accordingly bool imaged[MAX_ROOTS]; m_ContentsBox->DeleteAllItems(); - - // FIXME - will go away when wxMSW's wxTreeCtrl supports wxTR_HIDE_ROOT! - bool hasSuperRoot = (booksCnt > 1) || - (m_ContentsBox->GetWindowStyle() & wxTR_HIDE_ROOT); - // Don't show (Help) root if there's only one boook - if (hasSuperRoot) - { - roots[0] = m_ContentsBox->AddRoot(_("(Help)")); - m_ContentsBox->SetItemImage(roots[0], IMG_RootFolder); - m_ContentsBox->SetItemSelectedImage(roots[0], IMG_RootFolder); - imaged[0] = TRUE; - } + roots[0] = m_ContentsBox->AddRoot(_("(Help)")); + imaged[0] = true; - for (it = m_Data->GetContents(), i = 0; i < cnt; i++, it++) + for (size_t i = 0; i < cnt; i++) { + wxHtmlHelpDataItem *it = &contents[i]; // Handle books: - if (it->m_Level == 0) + if (it->level == 0) { - // special case, only one book, make it tree's root: - if (!hasSuperRoot) - { - roots[0] = roots[1] = m_ContentsBox->AddRoot( - it->m_Name, IMG_Book, -1, - new wxHtmlHelpTreeItemData(i)); - imaged[0] = imaged[1] = TRUE; - m_ContentsBox->SetItemBold(roots[1], TRUE); - } - // multiple books: + if (m_hfStyle & wxHF_MERGE_BOOKS) + // VS: we don't want book nodes, books' content should + // appear under tree's root. This line will create "fake" + // record about book node so that the rest of this look + // will believe there really _is_ book node and will + // behave correctly. + roots[1] = roots[0]; else { - if (m_hfStyle & wxHF_MERGE_BOOKS) - // VS: we don't want book nodes, books' content should - // appear under tree's root. This line will create "fake" - // record about book node so that the rest of this look - // will believe there really _is_ book node and will - // behave correctly. - roots[1] = roots[0]; - else - { - roots[1] = m_ContentsBox->AppendItem(roots[0], - it->m_Name, IMG_Book, -1, - new wxHtmlHelpTreeItemData(i)); - m_ContentsBox->SetItemBold(roots[1], TRUE); - } - imaged[1] = TRUE; + roots[1] = m_ContentsBox->AppendItem(roots[0], + it->name, IMG_Book, -1, + new wxHtmlHelpTreeItemData(i)); + m_ContentsBox->SetItemBold(roots[1], true); } + imaged[1] = true; } // ...and their contents: else { - roots[it->m_Level + 1] = m_ContentsBox->AppendItem( - roots[it->m_Level], it->m_Name, IMG_Page, + roots[it->level + 1] = m_ContentsBox->AppendItem( + roots[it->level], it->name, IMG_Page, -1, new wxHtmlHelpTreeItemData(i)); - imaged[it->m_Level + 1] = FALSE; + imaged[it->level + 1] = false; } m_PagesHash->Put(it->GetFullPath(), - new wxHtmlHelpHashData(i, roots[it->m_Level + 1])); + new wxHtmlHelpHashData(i, roots[it->level + 1])); // Set the icon for the node one level up in the hiearachy, // unless already done (see comment above imaged[] declaration) - if (!imaged[it->m_Level]) + if (!imaged[it->level]) { int image = IMG_Folder; if (m_hfStyle & wxHF_ICONS_BOOK) image = IMG_Book; else if (m_hfStyle & wxHF_ICONS_BOOK_CHAPTER) - image = (it->m_Level == 1) ? IMG_Book : IMG_Folder; - m_ContentsBox->SetItemImage(roots[it->m_Level], image); - m_ContentsBox->SetItemSelectedImage(roots[it->m_Level], image); - imaged[it->m_Level] = TRUE; + image = (it->level == 1) ? IMG_Book : IMG_Folder; + m_ContentsBox->SetItemImage(roots[it->level], image); + m_ContentsBox->SetItemImage(roots[it->level], image, + wxTreeItemIcon_Selected); + imaged[it->level] = true; } } - - m_ContentsBox->Expand(roots[0]); } @@ -854,18 +1012,20 @@ void wxHtmlHelpFrame::CreateIndex() m_IndexList->Clear(); - int cnt = m_Data->GetIndexCnt(); + size_t cnt = m_mergedIndex->size(); wxString cnttext; - if (cnt > INDEX_IS_SMALL) cnttext.Printf(_("%i of %i"), 0, cnt); - else cnttext.Printf(_("%i of %i"), cnt, cnt); + if (cnt > INDEX_IS_SMALL) + cnttext.Printf(_("%i of %i"), 0, cnt); + else + cnttext.Printf(_("%i of %i"), cnt, cnt); m_IndexCountInfo->SetLabel(cnttext); - if (cnt > INDEX_IS_SMALL) return; + if (cnt > INDEX_IS_SMALL) + return; - wxHtmlContentsItem* index = m_Data->GetIndex(); - - for (int i = 0; i < cnt; i++) - m_IndexList->Append(index[i].m_Name, (char*)(index + i)); + for (size_t i = 0; i < cnt; i++) + m_IndexList->Append((*m_mergedIndex)[i].name, + (char*)(&(*m_mergedIndex)[i])); } void wxHtmlHelpFrame::CreateSearch() @@ -885,6 +1045,9 @@ void wxHtmlHelpFrame::CreateSearch() void wxHtmlHelpFrame::RefreshLists() { + // Update m_mergedIndex: + UpdateMergedIndex(); + // Update the controls CreateContents(); CreateIndex(); CreateSearch(); @@ -910,7 +1073,7 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path) m_FixedFace = cfg->Read(wxT("hcFixedFace"), m_FixedFace); m_NormalFace = cfg->Read(wxT("hcNormalFace"), m_NormalFace); - m_FontSize = cfg->Read(wxT("hcFontSize"), m_FontSize); + m_FontSize = cfg->Read(wxT("hcBaseFontSize"), m_FontSize); { int i; @@ -961,13 +1124,18 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path cfg->Write(wxT("hcNavigPanel"), m_Cfg.navig_on); cfg->Write(wxT("hcSashPos"), (long)m_Cfg.sashpos); - cfg->Write(wxT("hcX"), (long)m_Cfg.x); - cfg->Write(wxT("hcY"), (long)m_Cfg.y); - cfg->Write(wxT("hcW"), (long)m_Cfg.w); - cfg->Write(wxT("hcH"), (long)m_Cfg.h); + if ( !IsIconized() ) + { + // Don't write if iconized as this would make the window + // disappear next time it is shown! + cfg->Write(wxT("hcX"), (long)m_Cfg.x); + cfg->Write(wxT("hcY"), (long)m_Cfg.y); + cfg->Write(wxT("hcW"), (long)m_Cfg.w); + cfg->Write(wxT("hcH"), (long)m_Cfg.h); + } cfg->Write(wxT("hcFixedFace"), m_FixedFace); cfg->Write(wxT("hcNormalFace"), m_NormalFace); - cfg->Write(wxT("hcFontSize"), (long)m_FontSize); + cfg->Write(wxT("hcBaseFontSize"), (long)m_FontSize); if (m_Bookmarks) { @@ -998,120 +1166,119 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, wxString fixf, int size) { - static int f_sizes[5][7] = - { - { 6, 7, 9, 12, 14, 16, 19}, - { 8, 9, 12, 14, 16, 19, 22}, - {10, 12, 14, 16, 19, 24, 32}, - {14, 16, 18, 24, 32, 38, 45}, - {16, 20, 24, 32, 38, 45, 50} - }; - - win->SetFonts(scalf, fixf, f_sizes[size]); + int f_sizes[7]; + f_sizes[0] = int(size * 0.6); + f_sizes[1] = int(size * 0.8); + f_sizes[2] = size; + f_sizes[3] = int(size * 1.2); + f_sizes[4] = int(size * 1.4); + f_sizes[5] = int(size * 1.6); + f_sizes[6] = int(size * 1.8); + + win->SetFonts(scalf, fixf, f_sizes); } class wxHtmlHelpFrameOptionsDialog : public wxDialog { - public: - wxComboBox *NormalFont, *FixedFont; - wxRadioBox *RadioBox; - wxHtmlWindow *TestWin; - - wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options"))) - { - wxString choices[5] = {_("very small"), _("small"), _("medium"), _("large"), _("very large")}; - wxBoxSizer *topsizer, *sizer, *sizer2; +public: + wxComboBox *NormalFont, *FixedFont; + wxSpinCtrl *FontSize; + wxHtmlWindow *TestWin; - topsizer = new wxBoxSizer(wxVERTICAL); - - sizer = new wxBoxSizer(wxHORIZONTAL); - - sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Normal font:")), wxVERTICAL); - sizer2->Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, - wxSize(200, 200), - 0, NULL, wxCB_DROPDOWN | wxCB_READONLY), - 1, wxEXPAND | wxLEFT | wxRIGHT, 10); - - sizer->Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10); - - sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Fixed font:")), wxVERTICAL); - sizer2->Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, - wxSize(200, 200), - 0, NULL, wxCB_DROPDOWN | wxCB_READONLY), - 1, wxEXPAND | wxLEFT | wxRIGHT, 10); - - sizer->Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10); - - topsizer->Add(sizer); - - topsizer->Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"), - wxDefaultPosition, wxDefaultSize, 5, choices, 5), - 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10); - - topsizer->Add(new wxStaticText(this, -1, _("Preview:")), - 0, wxLEFT | wxTOP, 10); - topsizer->Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(-1, 150)), - 1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10); - - sizer = new wxBoxSizer(wxHORIZONTAL); - sizer->Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10); - sizer->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), 0, wxALL, 10); - topsizer->Add(sizer, 0, wxALIGN_RIGHT); - - SetAutoLayout(TRUE); - SetSizer(topsizer); - topsizer->Fit(this); - Centre(wxBOTH); - } + wxHtmlHelpFrameOptionsDialog(wxWindow *parent) + : wxDialog(parent, wxID_ANY, wxString(_("Help Browser Options"))) + { + wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); + wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 3, 2, 5); + + sizer->Add(new wxStaticText(this, wxID_ANY, _("Normal font:"))); + sizer->Add(new wxStaticText(this, wxID_ANY, _("Fixed font:"))); + sizer->Add(new wxStaticText(this, wxID_ANY, _("Font size:"))); + + sizer->Add(NormalFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxSize(200, wxDefaultCoord), + 0, NULL, wxCB_DROPDOWN | wxCB_READONLY)); + + sizer->Add(FixedFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxSize(200, wxDefaultCoord), + 0, NULL, wxCB_DROPDOWN | wxCB_READONLY)); + + sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY)); + FontSize->SetRange(2, 100); + + topsizer->Add(sizer, 0, wxLEFT|wxRIGHT|wxTOP, 10); + + topsizer->Add(new wxStaticText(this, wxID_ANY, _("Preview:")), + 0, wxLEFT | wxTOP, 10); + topsizer->Add(TestWin = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxSize(20, 150), + wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER), + 1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10); + + wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL); + wxButton *ok; + sizer2->Add(ok = new wxButton(this, wxID_OK), 0, wxALL, 10); + ok->SetDefault(); + sizer2->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 10); + topsizer->Add(sizer2, 0, wxALIGN_RIGHT); + + SetSizer(topsizer); + topsizer->Fit(this); + Centre(wxBOTH); + } - void UpdateTestWin() - { - wxBusyCursor bcur; - SetFontsToHtmlWin(TestWin, - NormalFont->GetStringSelection(), - FixedFont->GetStringSelection(), - RadioBox->GetSelection()); - TestWin->SetPage(_( -"\ -Normal face
(and underlined. Italic face. \ -Bold face. Bold italic face.
\ -font size -2
\ -font size -1
\ -font size +0
\ -font size +1
\ -font size +2
\ -font size +3
\ -font size +4
\ -\ -

Fixed size face.
bold italic \ -bold italic underlined
\ -font size -2
\ -font size -1
\ -font size +0
\ -font size +1
\ -font size +2
\ -font size +3
\ -font size +4\ -" - )); - } + void UpdateTestWin() + { + wxBusyCursor bcur; + SetFontsToHtmlWin(TestWin, + NormalFont->GetStringSelection(), + FixedFont->GetStringSelection(), + FontSize->GetValue()); + + wxString content(_("font size")); + + content = _T("") + content + _T(" -2
") + _T("") + content + _T(" -1
") + _T("") + content + _T(" +0
") + _T("") + content + _T(" +1
") + _T("") + content + _T(" +2
") + _T("") + content + _T(" +3
") + _T("") + content + _T(" +4
") ; + + content = wxString( _T("
") ) + + _("Normal face
and underlined. ") + + _("Italic face. ") + + _("Bold face. ") + + _("Bold italic face.
") + + content + + wxString( _T("		") ) + + _("Fixed size face.
bold italic ") + + _("bold italic underlined
") + + content + + _T("
"); + + TestWin->SetPage( content ); + } - void OnUpdate(wxCommandEvent& WXUNUSED(event)) - { - UpdateTestWin(); - } + void OnUpdate(wxCommandEvent& WXUNUSED(event)) + { + UpdateTestWin(); + } + void OnUpdateSpin(wxSpinEvent& WXUNUSED(event)) + { + UpdateTestWin(); + } - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxHtmlHelpFrameOptionsDialog) }; BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog) - EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) - EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) + EVT_COMBOBOX(wxID_ANY, wxHtmlHelpFrameOptionsDialog::OnUpdate) + EVT_SPINCTRL(wxID_ANY, wxHtmlHelpFrameOptionsDialog::OnUpdateSpin) END_EVENT_TABLE() - void wxHtmlHelpFrame::OptionsDialog() { wxHtmlHelpFrameOptionsDialog dlg(this); @@ -1123,33 +1290,52 @@ void wxHtmlHelpFrame::OptionsDialog() enu.EnumerateFacenames(); m_NormalFonts = new wxArrayString; *m_NormalFonts = *enu.GetFacenames(); - m_NormalFonts->Sort(); + m_NormalFonts->Sort(); // ascending sort } if (m_FixedFonts == NULL) { wxFontEnumerator enu; - enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); + enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/); m_FixedFonts = new wxArrayString; *m_FixedFonts = *enu.GetFacenames(); - m_FixedFonts->Sort(); + m_FixedFonts->Sort(); // ascending sort + } + + // VS: We want to show the font that is actually used by wxHtmlWindow. + // If customization dialog wasn't used yet, facenames are empty and + // wxHtmlWindow uses default fonts -- let's find out what they + // are so that we can pass them to the dialog: + if (m_NormalFace.empty()) + { + wxFont fnt(m_FontSize, wxSWISS, wxNORMAL, wxNORMAL, false); + m_NormalFace = fnt.GetFaceName(); + } + if (m_FixedFace.empty()) + { + wxFont fnt(m_FontSize, wxMODERN, wxNORMAL, wxNORMAL, false); + m_FixedFace = fnt.GetFaceName(); } for (i = 0; i < m_NormalFonts->GetCount(); i++) dlg.NormalFont->Append((*m_NormalFonts)[i]); for (i = 0; i < m_FixedFonts->GetCount(); i++) dlg.FixedFont->Append((*m_FixedFonts)[i]); - if (!m_NormalFace.IsEmpty()) dlg.NormalFont->SetStringSelection(m_NormalFace); - else dlg.NormalFont->SetSelection(0); - if (!m_FixedFace.IsEmpty()) dlg.FixedFont->SetStringSelection(m_FixedFace); - else dlg.FixedFont->SetSelection(0); - dlg.RadioBox->SetSelection(m_FontSize); + if (!m_NormalFace.empty()) + dlg.NormalFont->SetStringSelection(m_NormalFace); + else + dlg.NormalFont->SetSelection(0); + if (!m_FixedFace.empty()) + dlg.FixedFont->SetStringSelection(m_FixedFace); + else + dlg.FixedFont->SetSelection(0); + dlg.FontSize->SetValue(m_FontSize); dlg.UpdateTestWin(); if (dlg.ShowModal() == wxID_OK) { m_NormalFace = dlg.NormalFont->GetStringSelection(); m_FixedFace = dlg.FixedFont->GetStringSelection(); - m_FontSize = dlg.RadioBox->GetSelection(); + m_FontSize = dlg.FontSize->GetValue(); SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_FixedFace, m_FontSize); } } @@ -1169,7 +1355,7 @@ void wxHtmlHelpFrame::NotifyPageChanged() if (ha) { bool olduc = m_UpdateContents; - m_UpdateContents = FALSE; + m_UpdateContents = false; m_ContentsBox->SelectItem(ha->m_Id); m_ContentsBox->EnsureVisible(ha->m_Id); m_UpdateContents = olduc; @@ -1184,6 +1370,20 @@ EVENT HANDLING : */ +void wxHtmlHelpFrame::OnActivate(wxActivateEvent& event) +{ + // This saves one mouse click when using the + // wxHTML for context sensitive help systems +#ifndef __WXGTK__ + // NB: wxActivateEvent is a bit broken in wxGTK + // and is sometimes sent when it should not be + if (event.GetActive() && m_HtmlWin) + m_HtmlWin->SetFocus(); +#endif + + event.Skip(); +} + void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) { switch (event.GetId()) @@ -1209,10 +1409,10 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage() + wxT("#") + an); if (ha && ha->m_Index > 0) { - wxHtmlContentsItem *it = m_Data->GetContents() + (ha->m_Index - 1); - if (it->m_Page[0] != 0) + const wxHtmlHelpDataItem& it = m_Data->GetContentsArray()[ha->m_Index - 1]; + if (!it.page.empty()) { - m_HtmlWin->LoadPage(it->GetFullPath()); + m_HtmlWin->LoadPage(it.GetFullPath()); NotifyPageChanged(); } } @@ -1230,15 +1430,20 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage() + wxT("#") + an); if (ha && ha->m_Index > 0) { - int level = m_Data->GetContents()[ha->m_Index].m_Level - 1; - wxHtmlContentsItem *it; + int level = + m_Data->GetContentsArray()[ha->m_Index].level - 1; int ind = ha->m_Index - 1; - it = m_Data->GetContents() + ind; - while (ind >= 0 && it->m_Level != level) ind--, it--; + const wxHtmlHelpDataItem *it = + &m_Data->GetContentsArray()[ind]; + while (ind >= 0 && it->level != level) + { + ind--; + it = &m_Data->GetContentsArray()[ind]; + } if (ind >= 0) { - if (it->m_Page[0] != 0) + if (!it->page.empty()) { m_HtmlWin->LoadPage(it->GetFullPath()); NotifyPageChanged(); @@ -1260,15 +1465,16 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) ha = (wxHtmlHelpHashData*) m_PagesHash->Get(adr); - if (ha && ha->m_Index < m_Data->GetContentsCnt() - 1) + const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray(); + if (ha && ha->m_Index < (int)contents.size() - 1) { - wxHtmlContentsItem *it = m_Data->GetContents() + (ha->m_Index + 1); + size_t idx = ha->m_Index + 1; - while (it->GetFullPath() == adr) it++; + while (contents[idx].GetFullPath() == adr) idx++; - if (it->m_Page[0] != 0) + if (!contents[idx].page.empty()) { - m_HtmlWin->LoadPage(it->GetFullPath()); + m_HtmlWin->LoadPage(contents[idx].GetFullPath()); NotifyPageChanged(); } } @@ -1283,14 +1489,14 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) { m_Cfg.sashpos = m_Splitter->GetSashPosition(); m_Splitter->Unsplit(m_NavigPan); - m_Cfg.navig_on = FALSE; + m_Cfg.navig_on = false; } else { - m_NavigPan->Show(TRUE); - m_HtmlWin->Show(TRUE); + m_NavigPan->Show(); + m_HtmlWin->Show(); m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); - m_Cfg.navig_on = TRUE; + m_Cfg.navig_on = true; } } break; @@ -1326,8 +1532,8 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) pos = m_BookmarksNames.Index(item); if (pos != wxNOT_FOUND) { - m_BookmarksNames.Remove(pos); - m_BookmarksPages.Remove(pos); + m_BookmarksNames.RemoveAt(pos); + m_BookmarksPages.RemoveAt(pos); m_Bookmarks->Delete(m_Bookmarks->GetSelection()); } } @@ -1348,22 +1554,29 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event) case wxID_HTML_OPENFILE : { + wxString filemask = wxString( + _("HTML files (*.html;*.htm)|*.html;*.htm|")) + + _("Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|") + + _("HTML Help Project (*.hhp)|*.hhp|") + +#if wxUSE_LIBMSPACK + _("Compressed HTML Help file (*.chm)|*.chm|") + +#endif + _("All files (*.*)|*"); wxString s = wxFileSelector(_("Open HTML document"), wxEmptyString, wxEmptyString, wxEmptyString, - _( -"HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|\ -Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|\ -HTML Help Project (*.hhp)|*.hhp|\ -All files (*.*)|*" - ), + filemask, wxOPEN | wxFILE_MUST_EXIST, this); if (!s.IsEmpty()) { wxString ext = s.Right(4).Lower(); - if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp")) + if (ext == _T(".zip") || ext == _T(".htb") || +#if wxUSE_LIBMSPACK + ext == _T(".chm") || +#endif + ext == _T(".hhp")) { wxBusyCursor bcur; m_Data->AddBook(s); @@ -1382,17 +1595,16 @@ All files (*.*)|*" void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event) { wxHtmlHelpTreeItemData *pg; - wxHtmlContentsItem *it; pg = (wxHtmlHelpTreeItemData*) m_ContentsBox->GetItemData(event.GetItem()); if (pg && m_UpdateContents) { - it = m_Data->GetContents() + (pg->m_Id); - m_UpdateContents = FALSE; - if (it->m_Page[0] != 0) - m_HtmlWin->LoadPage(it->GetFullPath()); - m_UpdateContents = TRUE; + const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray(); + m_UpdateContents = false; + if (!contents[pg->m_Id].page.empty()) + m_HtmlWin->LoadPage(contents[pg->m_Id].GetFullPath()); + m_UpdateContents = true; } } @@ -1400,10 +1612,10 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event) void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event)) { - wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexList->GetClientData(m_IndexList->GetSelection()); - if (it->m_Page[0] != 0) - m_HtmlWin->LoadPage(it->GetFullPath()); - NotifyPageChanged(); + wxHtmlHelpMergedIndexItem *it = (wxHtmlHelpMergedIndexItem*) + m_IndexList->GetClientData(m_IndexList->GetSelection()); + if (it) + DisplayIndexItem(it); } @@ -1418,34 +1630,58 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event) else { wxBusyCursor bcur; - const wxChar *cstr = sr.c_str(); - wxChar mybuff[512]; - wxChar *ptr; - bool first = TRUE; m_IndexList->Clear(); - int cnt = m_Data->GetIndexCnt(); - wxHtmlContentsItem* index = m_Data->GetIndex(); + const wxHtmlHelpMergedIndex& index = *m_mergedIndex; + size_t cnt = index.size(); int displ = 0; - for (int i = 0; i < cnt; i++) + for (size_t i = 0; i < cnt; i++) { - wxStrncpy(mybuff, index[i].m_Name, 512); - mybuff[511] = _T('\0'); - for (ptr = mybuff; *ptr != 0; ptr++) - if (*ptr >= _T('A') && *ptr <= _T('Z')) - *ptr -= (wxChar)(_T('A') - _T('a')); - if (wxStrstr(mybuff, cstr) != NULL) + if (index[i].name.Lower().find(sr) != wxString::npos) { - m_IndexList->Append(index[i].m_Name, (char*)(index + i)); - displ++; - if (first) + int pos = m_IndexList->Append(index[i].name, + (char*)(&index[i])); + + if (displ++ == 0) { - if (index[i].m_Page[0] != 0) - m_HtmlWin->LoadPage(index[i].GetFullPath()); - NotifyPageChanged(); - first = FALSE; + // don't automatically show topic selector if this + // item points to multiple pages: + if (index[i].items.size() == 1) + { + m_IndexList->SetSelection(0); + DisplayIndexItem(&index[i]); + } + } + + // if this is nested item of the index, show its parent(s) + // as well, otherwise it would not be clear what entry is + // shown: + wxHtmlHelpMergedIndexItem *parent = index[i].parent; + while (parent) + { + if (pos == 0 || + (index.Index(*(wxHtmlHelpMergedIndexItem*)m_IndexList->GetClientData(pos-1))) < index.Index(*parent)) + { + m_IndexList->Insert(parent->name, + pos, (char*)parent); + parent = parent->parent; + } + 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--; } } @@ -1463,19 +1699,22 @@ void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event)) wxBusyCursor bcur; m_IndexList->Clear(); - int cnt = m_Data->GetIndexCnt(); - bool first = TRUE; - wxHtmlContentsItem* index = m_Data->GetIndex(); + const wxHtmlHelpMergedIndex& index = *m_mergedIndex; + size_t cnt = index.size(); + bool first = true; - for (int i = 0; i < cnt; i++) + for (size_t i = 0; i < cnt; i++) { - m_IndexList->Append(index[i].m_Name, (char*)(index + i)); + m_IndexList->Append(index[i].name, (char*)(&index[i])); if (first) { - if (index[i].m_Page[0] != 0) - m_HtmlWin->LoadPage(index[i].GetFullPath()); - NotifyPageChanged(); - first = FALSE; + // don't automatically show topic selector if this + // item points to multiple pages: + if (index[i].items.size() == 1) + { + DisplayIndexItem(&index[i]); + } + first = false; } } @@ -1487,10 +1726,10 @@ void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event)) void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event)) { - wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList->GetClientData(m_SearchList->GetSelection()); + wxHtmlHelpDataItem *it = (wxHtmlHelpDataItem*) m_SearchList->GetClientData(m_SearchList->GetSelection()); if (it) { - if (it->m_Page[0] != 0) + if (!it->page.empty()) m_HtmlWin->LoadPage(it->GetFullPath()); NotifyPageChanged(); } @@ -1500,7 +1739,8 @@ void wxHtmlHelpFrame::OnSearch(wxCommandEvent& WXUNUSED(event)) { wxString sr = m_SearchText->GetLineText(0); - if (sr != wxEmptyString) KeywordSearch(sr); + if (!sr.empty()) + KeywordSearch(sr, wxHELP_SEARCH_ALL); } void wxHtmlHelpFrame::OnBookmarksSel(wxCommandEvent& WXUNUSED(event)) @@ -1519,6 +1759,13 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt) GetSize(&m_Cfg.w, &m_Cfg.h); GetPosition(&m_Cfg.x, &m_Cfg.y); +#ifdef __WXGTK__ + if (IsGrabbed()) + { + RemoveGrab(); + } +#endif + if (m_Splitter && m_Cfg.navig_on) m_Cfg.sashpos = m_Splitter->GetSashPosition(); if (m_Config) @@ -1532,7 +1779,21 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt) evt.Skip(); } +#ifdef __WXMAC__ +void wxHtmlHelpFrame::OnClose(wxCommandEvent& event) +{ + Close(true); +} + +void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event) +{ + wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2004, Vaclav Slavik et al"), wxT("HelpView"), + wxICON_INFORMATION|wxOK, this); +} +#endif + BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame) + EVT_ACTIVATE(wxHtmlHelpFrame::OnActivate) EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, wxHtmlHelpFrame::OnToolbar) EVT_BUTTON(wxID_HTML_BOOKMARKSREMOVE, wxHtmlHelpFrame::OnToolbar) EVT_BUTTON(wxID_HTML_BOOKMARKSADD, wxHtmlHelpFrame::OnToolbar) @@ -1546,6 +1807,12 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame) EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll) EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel) EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow) +#ifdef __WXMAC__ + EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::OnClose) + EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout) + EVT_MENU(wxID_HELP_CONTENTS, wxHtmlHelpFrame::OnAbout) +#endif + END_EVENT_TABLE() #endif // wxUSE_WXHTML_HELP