Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed show_progress argument in some private functions -- was never used

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-17 22:12:25 +00:00
parent 6aef9caf82
commit 052e12db71
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/html/helpctrl.h
View File

@@ -66,14 +66,15 @@ class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler
// Ctrl and it's wxHtmlWindow // Ctrl and it's wxHtmlWindow
virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
virtual void WriteCustomization(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() virtual void DestroyHelpWindow()
{ {
//if (m_Config) WriteCustomization(m_Config, m_ConfigRoot); //if (m_Config) WriteCustomization(m_Config, m_ConfigRoot);
if (m_helpFrame) m_helpFrame->Destroy(); if (m_helpFrame) m_helpFrame->Destroy();
} }
protected:
void OnCloseFrame(wxCloseEvent& evt) { m_helpFrame = NULL; evt.Skip(); } void OnCloseFrame(wxCloseEvent& evt) { m_helpFrame = NULL; evt.Skip(); }
wxHtmlHelpData m_helpData; wxHtmlHelpData m_helpData;
wxHtmlHelpFrame* m_helpFrame; wxHtmlHelpFrame* m_helpFrame;

33
include/wx/html/helpfrm.h
View File

@@ -133,18 +133,6 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
// (+ : page must contain the word ; - : page can't contain the word) // (+ : page must contain the word ; - : page can't contain the word)
// * if there is no + or - before the word, + is default // * 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) void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString)
{ {
m_Config = config; m_Config = config;
@@ -159,6 +147,22 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); 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(); virtual void OptionsDialog();
// Displays options dialog (fonts etc.) // Displays options dialog (fonts etc.)
@@ -220,12 +224,9 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
int m_FontSize; // 0,1,2 = small,medium,big int m_FontSize; // 0,1,2 = small,medium,big
wxString m_NormalFace, m_FixedFace; wxString m_NormalFace, m_FixedFace;
protected:
void Init(wxHtmlHelpData* data = NULL);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif #endif // wxUSE_HTML
#endif #endif

3
src/html/helpctrl.cpp
View File

@@ -77,7 +77,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
return retval; return retval;
} }
void wxHtmlHelpController::CreateHelpWindow(bool show_progress) void wxHtmlHelpController::CreateHelpWindow()
{ {
if (m_helpFrame) { if (m_helpFrame) {
m_helpFrame->Raise(); m_helpFrame->Raise();
@@ -98,7 +98,6 @@ void wxHtmlHelpController::CreateHelpWindow(bool show_progress)
m_helpFrame->UseConfig(m_Config, m_ConfigRoot); m_helpFrame->UseConfig(m_Config, m_ConfigRoot);
m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle); m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
m_helpFrame->RefreshLists(show_progress);
m_helpFrame->SetTitleFormat(m_titleFormat); m_helpFrame->SetTitleFormat(m_titleFormat);
m_helpFrame->Show(TRUE); m_helpFrame->Show(TRUE);
} }