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"
- ""));
+ TestWin -> SetPage(_(
+"
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 OnUpdate(wxCloseEvent& event)
+ void OnUpdate(wxCommandEvent& event)
{
UpdateTestWin();
}
@@ -942,7 +966,7 @@ void wxHtmlHelpFrame::OptionsDialog()
{
wxHtmlHelpFrameOptionsDialog dlg(this);
unsigned i;
-
+
if (m_NormalFonts == NULL) {
wxFontEnumerator enu;
enu.EnumerateFacenames();
@@ -957,7 +981,7 @@ void wxHtmlHelpFrame::OptionsDialog()
*m_FixedFonts = *enu.GetFacenames();
m_FixedFonts -> Sort();
}
-
+
for (i = 0; i < m_NormalFonts -> GetCount(); i++)
dlg.NormalFont -> Append((*m_NormalFonts)[i]);
for (i = 0; i < m_FixedFonts -> GetCount(); i++)
@@ -968,7 +992,7 @@ void wxHtmlHelpFrame::OptionsDialog()
else dlg.FixedFont -> SetSelection(0);
dlg.RadioBox -> SetSelection(m_FontSize);
dlg.UpdateTestWin();
-
+
if (dlg.ShowModal() == wxID_OK) {
m_NormalFace = dlg.NormalFont -> GetStringSelection();
m_FixedFace = dlg.FixedFont -> GetStringSelection();
@@ -1020,9 +1044,9 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
m_HtmlWin -> HistoryForward();
NotifyPageChanged();
break;
-
- case wxID_HTML_UP :
- if (m_PagesHash)
+
+ case wxID_HTML_UP :
+ if (m_PagesHash)
{
wxString an = m_HtmlWin -> GetOpenedAnchor();
wxHtmlHelpHashData *ha;
@@ -1039,8 +1063,8 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
}
break;
- case wxID_HTML_UPNODE :
- if (m_PagesHash)
+ case wxID_HTML_UPNODE :
+ if (m_PagesHash)
{
wxString an = m_HtmlWin -> GetOpenedAnchor();
wxHtmlHelpHashData *ha;
@@ -1053,7 +1077,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
int level = m_Data -> GetContents()[ha -> m_Index].m_Level - 1;
wxHtmlContentsItem *it;
int ind = ha -> m_Index - 1;
-
+
it = m_Data -> GetContents() + ind;
while (ind >= 0 && it -> m_Level != level) ind--, it--;
if (ind >= 0)
@@ -1065,13 +1089,13 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
}
break;
- 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;
@@ -1080,7 +1104,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
if (ha && ha -> m_Index < m_Data -> GetContentsCnt() - 1)
{
wxHtmlContentsItem *it = m_Data -> GetContents() + (ha -> m_Index + 1);
-
+
while (it -> m_Book -> GetBasePath() + it -> m_Page == adr) it++;
m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
NotifyPageChanged();
@@ -1108,12 +1132,12 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
case wxID_HTML_OPTIONS :
OptionsDialog();
break;
-
- case wxID_HTML_BOOKMARKSADD :
+
+ case wxID_HTML_BOOKMARKSADD :
{
wxString item;
wxString url;
-
+
item = m_HtmlWin -> GetOpenedPageTitle();
url = m_HtmlWin -> GetOpenedPage();
if (item == wxEmptyString) item = url.AfterLast(wxT('/'));
@@ -1124,12 +1148,12 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
}
}
break;
-
- case wxID_HTML_BOOKMARKSREMOVE :
+
+ case wxID_HTML_BOOKMARKSREMOVE :
{
wxString item;
int pos;
-
+
item = m_Bookmarks -> GetStringSelection();
pos = m_BookmarksNames.Index(item);
if (pos != wxNOT_FOUND) {
@@ -1143,21 +1167,30 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
#if wxUSE_PRINTING_ARCHITECTURE
case wxID_HTML_PRINT :
{
- if (m_Printer == NULL)
+ if (m_Printer == NULL)
m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this);
- m_Printer -> PrintFile(m_HtmlWin -> GetOpenedPage());
+ if (!m_HtmlWin -> GetOpenedPage())
+ wxLogWarning(_("Cannot print empty page."));
+ else
+ m_Printer -> PrintFile(m_HtmlWin -> GetOpenedPage());
}
break;
#endif
case wxID_HTML_OPENFILE :
{
- wxString s = wxFileSelector(_("Open HTML document"), wxEmptyString, wxEmptyString, wxEmptyString,
- wxT("HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|"
- "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
- "HTML Help Project (*.hhp)|*.hhp|"
- "All files (*.*)|*"),
- wxOPEN | wxFILE_MUST_EXIST, this);
+ 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 (*.*)|*"
+ ),
+ wxOPEN | wxFILE_MUST_EXIST,
+ this);
if (!s.IsEmpty())
{
wxString ext = s.Right(4).Lower();
@@ -1183,8 +1216,8 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
wxHtmlContentsItem *it;
pg = (wxHtmlHelpTreeItemData*) m_ContentsBox -> GetItemData(event.GetItem());
-
- if (pg && m_UpdateContents)
+
+ if (pg && m_UpdateContents)
{
it = m_Data -> GetContents() + (pg -> m_Id);
m_UpdateContents = FALSE;
@@ -1207,7 +1240,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
{
wxString sr = m_IndexText -> GetLineText(0);
sr.MakeLower();
- if (sr == wxEmptyString)
+ if (sr == wxEmptyString)
OnIndexAll(event);
else {
@@ -1215,7 +1248,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
const wxChar *cstr = sr.c_str();
wxChar mybuff[512], *ptr;
bool first = TRUE;
-
+
m_IndexList->Clear();
int cnt = m_Data->GetIndexCnt();
wxHtmlContentsItem* index = m_Data->GetIndex();
@@ -1224,9 +1257,10 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
for (int i = 0; i < cnt; i++)
{
wxStrncpy(mybuff, index[i].m_Name, 512);
- mybuff[511] = 0;
- for (ptr = mybuff; *ptr != 0; ptr++)
- if (*ptr >= 'A' && *ptr <= 'Z') *ptr -= 'A' - 'a';
+ 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) {
m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
displ++;
@@ -1250,7 +1284,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
{
wxBusyCursor bcur;
-
+
m_IndexList->Clear();
int cnt = m_Data->GetIndexCnt();
bool first = TRUE;
@@ -1274,7 +1308,7 @@ void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
{
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList -> GetClientData(m_SearchList -> GetSelection());
- if (it)
+ if (it)
{
m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
NotifyPageChanged();
@@ -1309,6 +1343,11 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
if (m_Config)
WriteCustomization(m_Config, m_ConfigRoot);
+ if (m_helpController && m_helpController->IsKindOf(CLASSINFO(wxHtmlHelpController)))
+ {
+ ((wxHtmlHelpController*) m_helpController)->OnCloseFrame(evt);
+ }
+
evt.Skip();
}
@@ -1325,7 +1364,7 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
EVT_TEXT_ENTER(wxID_HTML_INDEXTEXT, wxHtmlHelpFrame::OnIndexFind)
EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll)
EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
- EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
+ EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
END_EVENT_TABLE()
#endif