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"));
int notebook_page = 0;
+#if wxUSE_STATUSBAR
CreateStatusBar();
+#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
// toolbar?
}
m_HtmlWin->SetRelatedFrame(this, m_TitleFormat);
+#if wxUSE_STATUSBAR
m_HtmlWin->SetRelatedStatusBar(0);
+#endif // wxUSE_STATUSBAR
if ( m_Config )
m_HtmlWin->ReadCustomization(m_Config, m_ConfigRoot);
wxHtmlHelpFrame::~wxHtmlHelpFrame()
{
+ delete m_mergedIndex;
+
// PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
if (m_DataCreated)
delete m_Data;
enu.EnumerateFacenames();
m_NormalFonts = new wxArrayString;
*m_NormalFonts = *enu.GetFacenames();
- m_NormalFonts->Sort(wxStringSortAscending);
+ m_NormalFonts->Sort(); // ascending sort
}
if (m_FixedFonts == NULL)
{
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/);
m_FixedFonts = new wxArrayString;
*m_FixedFonts = *enu.GetFacenames();
- m_FixedFonts->Sort(wxStringSortAscending);
+ m_FixedFonts->Sort(); // ascending sort
}
// VS: We want to show the font that is actually used by wxHtmlWindow.
if (displ++ == 0)
{
- m_IndexList->SetSelection(0);
- DisplayIndexItem(&index[i]);
+ // 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)
m_IndexList->Append(index[i].name, (char*)(&index[i]));
if (first)
{
- DisplayIndexItem(&index[i]);
+ // don't automatically show topic selector if this
+ // item points to multiple pages:
+ if (index[i].items.size() == 1)
+ {
+ DisplayIndexItem(&index[i]);
+ }
first = false;
}
}
#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()