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

fixed static members

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-07-25 12:21:23 +00:00
parent 420ec58abb
commit a76015e6eb
4 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/html/htmlwin.cpp
View File

@@ -195,7 +195,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
}
node = node -> GetNext();
}
if (src == wxEmptyString) src = m_DefaultFilter.ReadFile(*f);
if (src == wxEmptyString) {
if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
src = m_DefaultFilter -> ReadFile(*f);
}
m_FS -> ChangePathTo(f -> GetLocation());
rt_val = SetPage(src);
@@ -377,7 +380,15 @@ void wxHtmlWindow::HistoryClear()
wxList wxHtmlWindow::m_Filters;
wxHtmlFilterPlainText wxHtmlWindow::m_DefaultFilter;
wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
void wxHtmlWindow::CleanUpStatics()
{
if (m_DefaultFilter) delete m_DefaultFilter;
m_DefaultFilter = NULL;
}
void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
{
@@ -525,6 +536,21 @@ END_EVENT_TABLE()
// A module to allow initialization/cleanup
// without calling these functions from app.cpp or from
// the user's application.
class wxHtmlWinModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
public:
wxHtmlWinModule() : wxModule() {}
bool OnInit() { return TRUE; }
void OnExit() { wxHtmlWindow::CleanUpStatics(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)