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

I got tired of some of the memory leak messages related to html and

Browse Source 
filesystem classes, (even when I wasn't using them) so I added to the
cleanup code already there.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-09-20 20:15:31 +00:00
parent d57eb7b9b3
commit 269e82009d
3 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/filesys.h
View File

@@ -162,7 +162,7 @@ class WXDLLEXPORT wxFileSystem : public wxObject
// unless is_dir = TRUE 'location' is *not* the directory but // unless is_dir = TRUE 'location' is *not* the directory but
// file contained in this directory // file contained in this directory
// (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/") // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")
wxString GetPath() const {return m_Path;} wxString GetPath() const {return m_Path;}
wxFSFile* OpenFile(const wxString& location); wxFSFile* OpenFile(const wxString& location);
@@ -175,6 +175,9 @@ class WXDLLEXPORT wxFileSystem : public wxObject
static void AddHandler(wxFileSystemHandler *handler); static void AddHandler(wxFileSystemHandler *handler);
// Adds FS handler. // Adds FS handler.
// In fact, this class is only front-end to the FS hanlers :-) // In fact, this class is only front-end to the FS hanlers :-)
static void CleanUpHandlers();
// remove all items from the m_Handlers list
}; };
@@ -204,5 +207,5 @@ special characters :
#endif #endif
// (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
#endif #endif
// __FILESYS_H__ // __FILESYS_H__

39
src/common/filesys.cpp
View File

@@ -201,9 +201,9 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
for (i = m_Path.Length()-1; i >= 0; i--) for (i = m_Path.Length()-1; i >= 0; i--)
if (m_Path[(unsigned int) i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/'); // wanna be windows-safe if (m_Path[(unsigned int) i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/'); // wanna be windows-safe
if (is_dir == FALSE) if (is_dir == FALSE)
{ {
for (i = m_Path.Length()-1; i >= 0; i--) for (i = m_Path.Length()-1; i >= 0; i--)
{ {
if (m_Path[(unsigned int) i] == _T('/')) if (m_Path[(unsigned int) i] == _T('/'))
{ {
@@ -212,9 +212,9 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
i -= 2; i -= 2;
continue; continue;
} }
else else
{ {
pathpos = i; pathpos = i;
break; break;
} }
} }
@@ -223,9 +223,9 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
break; break;
} }
} }
if (pathpos == -1) if (pathpos == -1)
{ {
for (i = 0; i < (int) m_Path.Length(); i++) for (i = 0; i < (int) m_Path.Length(); i++)
{ {
if (m_Path[(unsigned int) i] == _T(':')) if (m_Path[(unsigned int) i] == _T(':'))
{ {
@@ -234,12 +234,12 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
break; break;
} }
} }
if (i == (int) m_Path.Length()) if (i == (int) m_Path.Length())
m_Path = wxEmptyString; m_Path = wxEmptyString;
} }
else else
{ {
if (m_Path[m_Path.Length()-1] != _T('/')) if (m_Path[m_Path.Length()-1] != _T('/'))
m_Path << _T('/'); m_Path << _T('/');
m_Path.Remove(pathpos+1); m_Path.Remove(pathpos+1);
} }
@@ -258,7 +258,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
ln = loc.Length(); ln = loc.Length();
meta = 0; meta = 0;
for (i = 0; i < ln; i++) for (i = 0; i < ln; i++)
{ {
if (loc[(unsigned int) i] == _T('\\')) loc.GetWritableChar(i) = _T('/'); // wanna be windows-safe if (loc[(unsigned int) i] == _T('\\')) loc.GetWritableChar(i) = _T('/'); // wanna be windows-safe
if (!meta) switch (loc[(unsigned int) i]) if (!meta) switch (loc[(unsigned int) i])
@@ -269,13 +269,13 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
m_LastName = wxEmptyString; m_LastName = wxEmptyString;
// try relative paths first : // try relative paths first :
if (meta != _T(':')) if (meta != _T(':'))
{ {
node = m_Handlers.GetFirst(); node = m_Handlers.GetFirst();
while (node) while (node)
{ {
wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData(); wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
if (h->CanOpen(m_Path + location)) if (h->CanOpen(m_Path + location))
{ {
s = h->OpenFile(*this, m_Path + location); s = h->OpenFile(*this, m_Path + location);
if (s) { m_LastName = m_Path + location; break; } if (s) { m_LastName = m_Path + location; break; }
@@ -285,13 +285,13 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
} }
// if failed, try absolute paths : // if failed, try absolute paths :
if (s == NULL) if (s == NULL)
{ {
node = m_Handlers.GetFirst(); node = m_Handlers.GetFirst();
while (node) while (node)
{ {
wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData(); wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
if (h->CanOpen(location)) if (h->CanOpen(location))
{ {
s = h->OpenFile(*this, location); s = h->OpenFile(*this, location);
if (s) { m_LastName = location; break; } if (s) { m_LastName = location; break; }
@@ -309,6 +309,12 @@ void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
} }
void wxFileSystem::CleanUpHandlers()
{
m_Handlers.DeleteContents(TRUE);
m_Handlers.Clear();
}
///// Module: ///// Module:
@@ -322,15 +328,16 @@ class wxFileSystemModule : public wxModule
wxFileSystem::AddHandler(new wxLocalFSHandler); wxFileSystem::AddHandler(new wxLocalFSHandler);
return TRUE; return TRUE;
} }
virtual void OnExit() virtual void OnExit()
{ {
wxFileSystemHandler::CleanUpStatics(); wxFileSystemHandler::CleanUpStatics();
wxFileSystem::CleanUpHandlers();
} }
}; };
IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
#endif #endif
// (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS

19
src/html/htmlwin.cpp
View File

@@ -40,7 +40,7 @@
WX_DEFINE_OBJARRAY(HtmlHistoryArray) WX_DEFINE_OBJARRAY(HtmlHistoryArray)
wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name) long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
{ {
m_tmpMouseMoved = FALSE; m_tmpMouseMoved = FALSE;
@@ -89,9 +89,9 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar)
{ {
m_RelatedStatusBar = bar; m_RelatedStatusBar = bar;
} }
void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes) void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes)
{ {
m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes); m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);
@@ -220,7 +220,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
if (!c) return FALSE; if (!c) return FALSE;
else { else {
int y; int y;
for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY(); for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY();
Scroll(-1, y / HTML_SCROLL_STEP); Scroll(-1, y / HTML_SCROLL_STEP);
m_OpenedAnchor = anchor; m_OpenedAnchor = anchor;
@@ -258,7 +258,7 @@ void wxHtmlWindow::CreateLayout()
GetClientSize(&ClientWidth, &ClientHeight); GetClientSize(&ClientWidth, &ClientHeight);
#ifndef __WXMSW__ #ifndef __WXMSW__
// VS : this looks extremely ugly under windoze, better fix needed! // VS : this looks extremely ugly under windoze, better fix needed!
SetScrollbars(1, 1, 0, ClientHeight * 2); // always on SetScrollbars(1, 1, 0, ClientHeight * 2); // always on
#endif #endif
GetClientSize(&ClientWidth, &ClientHeight); GetClientSize(&ClientWidth, &ClientHeight);
m_Cell -> Layout(ClientWidth); m_Cell -> Layout(ClientWidth);
@@ -276,7 +276,7 @@ void wxHtmlWindow::CreateLayout()
} }
} }
void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
{ {
@@ -389,13 +389,16 @@ void wxHtmlWindow::CleanUpStatics()
{ {
if (m_DefaultFilter) delete m_DefaultFilter; if (m_DefaultFilter) delete m_DefaultFilter;
m_DefaultFilter = NULL; m_DefaultFilter = NULL;
wxNode* node = m_Filters.GetFirst();
m_Filters.DeleteContents(TRUE);
m_Filters.Clear();
} }
void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
{ {
m_Filters.DeleteContents(TRUE);
m_Filters.Append(filter); m_Filters.Append(filter);
} }