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

Remove workaround for link problem with versions of mingw before 3.4.2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-04-11 23:29:55 +00:00
parent fe47da7b04
commit 3b676ed7f1
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/debugrpt.cpp
View File

@@ -51,7 +51,6 @@
#if wxUSE_ZIPSTREAM #if wxUSE_ZIPSTREAM
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/zipstrm.h" #include "wx/zipstrm.h"
#include "wx/ptr_scpd.h"
#endif // wxUSE_ZIPSTREAM #endif // wxUSE_ZIPSTREAM
WX_CHECK_BUILD_OPTIONS("wxQA") WX_CHECK_BUILD_OPTIONS("wxQA")
@@ -586,10 +585,6 @@ bool wxDebugReport::DoProcess()
#if wxUSE_ZIPSTREAM #if wxUSE_ZIPSTREAM
// leave the default name wxZipOutputStreamPtr free for users
wxDECLARE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
wxDEFINE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDebugReportCompress // wxDebugReportCompress
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -603,11 +598,7 @@ bool wxDebugReportCompress::DoProcess()
// create the streams // create the streams
wxFileName fn(GetDirectory(), GetReportName(), _T("zip")); wxFileName fn(GetDirectory(), GetReportName(), _T("zip"));
wxFFileOutputStream os(fn.GetFullPath(), _T("wb")); wxFFileOutputStream os(fn.GetFullPath(), _T("wb"));
wxZipOutputStream zos(os, 9);
// create this one on the heap as a workaround since otherwise the mingw
// 3.2.3 linker cannot find ~wxZipOutputStream() when building a dll
// version of the library.
wxDbgZipOutputStreamPtr zos(new wxZipOutputStream(os, 9));
// add all files to the ZIP one // add all files to the ZIP one
wxString name, desc; wxString name, desc;
@@ -618,16 +609,16 @@ bool wxDebugReportCompress::DoProcess()
wxZipEntry *ze = new wxZipEntry(name); wxZipEntry *ze = new wxZipEntry(name);
ze->SetComment(desc); ze->SetComment(desc);
if ( !zos->PutNextEntry(ze) ) if ( !zos.PutNextEntry(ze) )
return false; return false;
wxFileName filename(fn.GetPath(), name); wxFileName filename(fn.GetPath(), name);
wxFFileInputStream is(filename.GetFullPath()); wxFFileInputStream is(filename.GetFullPath());
if ( !is.IsOk() || !zos->Write(is).IsOk() ) if ( !is.IsOk() || !zos.Write(is).IsOk() )
return false; return false;
} }
if ( !zos->Close() ) if ( !zos.Close() )
return false; return false;
m_zipfile = fn.GetFullPath(); m_zipfile = fn.GetFullPath();