fixing memory leaks & mem tracing false alerts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,11 +59,13 @@ class WXDLLEXPORT HtmlHistoryItem : public wxObject
|
||||
|
||||
WX_DECLARE_EXPORTED_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray);
|
||||
|
||||
|
||||
class wxHtmlWinModule;
|
||||
|
||||
class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
|
||||
|
||||
friend class wxHtmlWinModule;
|
||||
|
||||
public:
|
||||
wxHtmlWindow() : wxScrolledWindow() {};
|
||||
@@ -141,9 +143,6 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
|
||||
// called when users clicked on hypertext link. Default behavior is to
|
||||
// call LoadPage(loc)
|
||||
|
||||
static void CleanUpStatics();
|
||||
// cleans static variables
|
||||
|
||||
wxHtmlWinParser *GetParser() const { return m_Parser; }
|
||||
// return a pointer to the parser.
|
||||
|
||||
@@ -166,6 +165,9 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
|
||||
virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
|
||||
// returns new filter (will be stored into m_DefaultFilter variable)
|
||||
|
||||
static void CleanUpStatics();
|
||||
// cleans static variables
|
||||
|
||||
|
||||
protected:
|
||||
wxHtmlContainerCell *m_Cell;
|
||||
@@ -204,13 +206,16 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
|
||||
// contains last link name
|
||||
int m_tmpCanDrawLocks;
|
||||
// if >0 contents of the window is not redrawn
|
||||
// (in order to avoid ugly bliking)
|
||||
// (in order to avoid ugly blinking)
|
||||
|
||||
static wxList m_Filters;
|
||||
// list of HTML filters
|
||||
static wxHtmlFilter *m_DefaultFilter;
|
||||
// this filter is used when no filter is able to read some file
|
||||
|
||||
static wxCursor *s_cur_hand;
|
||||
static wxCursor *s_cur_arrow;
|
||||
|
||||
HtmlHistoryArray m_History;
|
||||
int m_HistoryPos;
|
||||
// browser history
|
||||
|
Reference in New Issue
Block a user