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

A better workaround for the link problem with mingw versions before 3.4.2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-04-11 23:26:44 +00:00
parent eedf3bcbb3
commit fe47da7b04
2 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/zipstrm.cpp
View File

@@ -1182,25 +1182,21 @@ wxZipInputStream::wxZipInputStream(wxInputStream& stream,
wxMBConv& conv /*=wxConvLocal*/)
: wxArchiveInputStream(stream, conv)
{
#if 1 //WXWIN_COMPATIBILITY_2_6
m_allowSeeking = false;
#endif
m_ffile = NULL;
Init();
}
#if 1 //WXWIN_COMPATIBILITY_2_6
// Compatibility constructor
// Part of the compatibility constructor, which has been made inline to
// avoid a problem with it not being exported by mingw 3.2.3
//
wxZipInputStream::wxZipInputStream(const wxString& archive,
const wxString& file)
: wxArchiveInputStream(OpenFile(archive), wxConvLocal)
void wxZipInputStream::Init(const wxString& file)
{
// no error messages
wxLogNull nolog;
Init();
m_allowSeeking = true;
m_ffile = wx_static_cast(wxFFileInputStream*, m_parent_i_stream);
wx__ZipEntryPtr entry;
if (m_ffile->Ok()) {
@@ -1217,8 +1213,7 @@ wxZipInputStream::wxZipInputStream(const wxString& archive,
wxInputStream& wxZipInputStream::OpenFile(const wxString& archive)
{
wxLogNull nolog;
m_ffile = new wxFFileInputStream(archive);
return *m_ffile;
return *new wxFFileInputStream(archive);
}
#endif // WXWIN_COMPATIBILITY_2_6
@@ -1239,6 +1234,10 @@ void wxZipInputStream::Init()
m_signature = 0;
m_TotalEntries = 0;
m_lasterror = m_parent_i_stream->GetLastError();
m_ffile = NULL;
#if 1 //WXWIN_COMPATIBILITY_2_6
m_allowSeeking = false;
#endif
}
wxZipInputStream::~wxZipInputStream()