Disable typemap for wxImage constructors

[wxWidgets.git] / src / common / debugrpt.cpp

diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 2f2c707b9b5bfe74238cfc65068872731bf08fd9..bec66764237bdf388514570e2f21af96694d879e 100644 (file)
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -549,7 +549,9 @@ bool wxDebugReport::DoProcess()
 
 #if wxUSE_ZIPSTREAM
 
-wxDEFINE_SCOPED_PTR_TYPE(wxZipOutputStream)
+// leave the default name wxZipOutputStreamPtr free for users
+wxDECLARE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
+wxDEFINE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
 
 // ----------------------------------------------------------------------------
 // wxDebugReportCompress
@@ -564,7 +566,11 @@ bool wxDebugReportCompress::DoProcess()
     // create the streams
     wxFileName fn(GetDirectory(), GetReportName(), _T("zip"));
     wxFFileOutputStream os(fn.GetFullPath(), _T("wb"));
-    wxZipOutputStreamPtr zos(new wxZipOutputStream(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
     wxString name, desc;