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

Change the factory constructor to not use a predefined wxMBConv object as it

Browse Source 
prevents global instances of the factories. The predefined converters are
references which may not have been initialised when a global factory's
constructor runs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-11-16 14:30:20 +00:00
parent f2dc88a050
commit 80e62471ad
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/archive.h
View File

@@ -342,7 +342,8 @@ public:
wxPathFormat format = wxPATH_NATIVE) const = 0; wxPathFormat format = wxPATH_NATIVE) const = 0;
void SetConv(wxMBConv& conv) { m_pConv = &conv; } void SetConv(wxMBConv& conv) { m_pConv = &conv; }
wxMBConv& GetConv() const { return *m_pConv; } wxMBConv& GetConv() const
{ if (m_pConv) return *m_pConv; else return wxConvLocal; }
static const wxArchiveClassFactory *Find(const wxChar *protocol, static const wxArchiveClassFactory *Find(const wxChar *protocol,
wxStreamProtocolType type wxStreamProtocolType type
@@ -363,7 +364,7 @@ protected:
virtual wxArchiveInputStream *DoNewStream(wxInputStream *stream) const = 0; virtual wxArchiveInputStream *DoNewStream(wxInputStream *stream) const = 0;
virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0; virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0;
wxArchiveClassFactory() : m_pConv(&wxConvLocal), m_next(this) { } wxArchiveClassFactory() : m_pConv(NULL), m_next(this) { }
wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f)) wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f))
{ return *this; } { return *this; }