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

10
include/wx/filesys.h
View File

@@ -116,10 +116,16 @@ class WXDLLEXPORT wxFileSystemHandler : public wxObject
// Returns MIME type of the file - w/o need to open it
// (default behaviour is that it returns type based on extension)
public:
static void CleanUpStatics();
// deletes static members (m_MimeMng). It can be called
// as many times as you wish because m_MimeMng is created
// on demand
private:
static wxMimeTypesManager m_MimeMng;
static wxMimeTypesManager *m_MimeMng;
// MIME manager
// (it's static and thus shared by all instances and derived classes)
// (it's static and thus shared by all instances and derived classes)
};

8
include/wx/html/htmlwin.h
View File

@@ -109,7 +109,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
static wxList m_Filters;
// list of HTML filters
static wxHtmlFilterPlainText m_DefaultFilter;
static wxHtmlFilter *m_DefaultFilter;
// this filter is used when no filter is able to read some file
HtmlHistoryArray m_History;
@@ -189,6 +189,9 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
virtual void OnLinkClicked(const wxString& link);
// called when users clicked on hypertext link. Default behavior is to
// call LoadPage(loc)
static void CleanUpStatics();
// cleans static variables
protected:
bool ScrollToAnchor(const wxString& anchor);
@@ -206,6 +209,9 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
void OnMouseEvent(wxMouseEvent& event);
void OnIdle(wxIdleEvent& event);
void OnKeyDown(wxKeyEvent& event);
virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
// returns new filter (will be stored into m_DefaultFilter variable)
DECLARE_EVENT_TABLE()
};