X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69b5cec2b0993ce4cd56f2e50ab94e5ebd20069c..efe66bbc0e9f463a6dd3ad49717474dd801bebf3:/src/html/helpfrm.cpp diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 5c1dffd66e..be646fea90 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -282,6 +282,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, CreateStatusBar(); +#if wxUSE_TOOLBAR // toolbar? if (style & (wxHF_TOOLBAR | wxHF_FLAT_TOOLBAR)) { @@ -292,6 +293,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, AddToolbarButtons(toolBar, style); toolBar->Realize(); } +#endif //wxUSE_TOOLBAR wxSizer *navigSizer = NULL; @@ -454,7 +456,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, sizer->Add(m_SearchList, 1, wxALL | wxEXPAND, 2); m_NavigNotebook->AddPage(dummy, _("Search")); - m_SearchPage = notebook_page++; + m_SearchPage = notebook_page; } m_HtmlWin->Show(TRUE); @@ -501,9 +503,13 @@ wxHtmlHelpFrame::~wxHtmlHelpFrame() 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 = @@ -576,6 +582,7 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style) FALSE, -1, -1, (wxObject *) NULL, _("Display options dialog")); } +#endif //wxUSE_TOOLBAR void wxHtmlHelpFrame::SetTitleFormat(const wxString& format) @@ -740,21 +747,29 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword, if (foundcnt) { wxHtmlContentsItem *it; - if (mode == wxHELP_SEARCH_ALL) - { - it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0); - } - else if (mode == wxHELP_SEARCH_INDEX) + switch ( mode ) { - it = (wxHtmlContentsItem*) m_IndexList->GetClientData(0); + default: + wxFAIL_MSG( _T("unknown help search mode") ); + // fall back + + case wxHELP_SEARCH_ALL: + it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0); + break; + + case wxHELP_SEARCH_INDEX: + it = (wxHtmlContentsItem*) m_IndexList->GetClientData(0); + break; } + if (it) { m_HtmlWin->LoadPage(it->GetFullPath()); NotifyPageChanged(); } } - return (foundcnt > 0); + + return foundcnt > 0; } void wxHtmlHelpFrame::CreateContents() @@ -1065,30 +1080,30 @@ public: NormalFont->GetStringSelection(), FixedFont->GetStringSelection(), FontSize->GetValue()); - 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\ -

" - )); + + 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)) @@ -1378,22 +1393,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);