diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h index 900d0ac638..85511c8725 100644 --- a/include/wx/html/helpctrl.h +++ b/include/wx/html/helpctrl.h @@ -66,14 +66,15 @@ class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler // Ctrl and it's wxHtmlWindow virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); virtual void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); - virtual void CreateHelpWindow(bool show_progress = FALSE); + + protected: + virtual void CreateHelpWindow(); virtual void DestroyHelpWindow() { //if (m_Config) WriteCustomization(m_Config, m_ConfigRoot); if (m_helpFrame) m_helpFrame->Destroy(); } - protected: void OnCloseFrame(wxCloseEvent& evt) { m_helpFrame = NULL; evt.Skip(); } wxHtmlHelpData m_helpData; wxHtmlHelpFrame* m_helpFrame; diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index 58b0cb9584..80256d84af 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -133,18 +133,6 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame // (+ : page must contain the word ; - : page can't contain the word) // * if there is no + or - before the word, + is default - void RefreshLists(bool show_progress = FALSE); - // Refreshes Contents and Index tabs - - void CreateContents(bool show_progress = FALSE); - // Adds items to m_Contents tree control - - void CreateIndex(bool show_progress = FALSE); - // Adds items to m_IndexList - - void CreateSearch(); - // Add books to search choice panel - void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString) { m_Config = config; @@ -159,6 +147,22 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); // ... + protected: + void Init(wxHtmlHelpData* data = NULL); + + void RefreshLists(); + // Refreshes Contents and Index tabs + + void CreateContents(); + // Adds items to m_Contents tree control + + void CreateIndex(); + // Adds items to m_IndexList + + void CreateSearch(); + // Add books to search choice panel + + virtual void OptionsDialog(); // Displays options dialog (fonts etc.) @@ -220,12 +224,9 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame int m_FontSize; // 0,1,2 = small,medium,big wxString m_NormalFace, m_FixedFace; - protected: - void Init(wxHtmlHelpData* data = NULL); - DECLARE_EVENT_TABLE() }; -#endif +#endif // wxUSE_HTML #endif diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp index 58d03d4291..2137023534 100644 --- a/src/html/helpctrl.cpp +++ b/src/html/helpctrl.cpp @@ -77,7 +77,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg) return retval; } -void wxHtmlHelpController::CreateHelpWindow(bool show_progress) +void wxHtmlHelpController::CreateHelpWindow() { if (m_helpFrame) { m_helpFrame->Raise(); @@ -98,7 +98,6 @@ void wxHtmlHelpController::CreateHelpWindow(bool show_progress) m_helpFrame->UseConfig(m_Config, m_ConfigRoot); m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle); - m_helpFrame->RefreshLists(show_progress); m_helpFrame->SetTitleFormat(m_titleFormat); m_helpFrame->Show(TRUE); }