Disable handling of wxEVT_MOUSEWHEEL in wxVarScrollHelperEvtHandler in wxGTK.

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

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 22a053b4c46b8dccfc945cc5c7c901a19944a29b..360f22936c43c857a9f4b3d9e3a66edd3e20461c 100644 (file)
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -1,36 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        archive.cpp
+// Name:        src/common/archive.cpp
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
-// RCS-ID:      $Id$
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "archive.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
+    #pragma hdrstop
 #endif
 
-#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
 
 #include "wx/archive.h"
-#include "wx/html/forcelnk.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxObject)
-
-FORCE_LINK(zipstrm)
+IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase)
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -43,6 +31,13 @@ wxArchiveInputStream::wxArchiveInputStream(wxInputStream& stream,
 {
 }
 
+wxArchiveInputStream::wxArchiveInputStream(wxInputStream *stream,
+                                           wxMBConv& conv)
+  : wxFilterInputStream(stream),
+    m_conv(conv)
+{
+}
+
 
 /////////////////////////////////////////////////////////////////////////////
 // wxArchiveOutputStream
@@ -54,6 +49,13 @@ wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream& stream,
 {
 }
 
+wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream *stream,
+                                             wxMBConv& conv)
+  : wxFilterOutputStream(stream),
+    m_conv(conv)
+{
+}
+
 
 /////////////////////////////////////////////////////////////////////////////
 // wxArchiveEntry
@@ -71,4 +73,25 @@ wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
     return *this;
 }
 
-#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// wxArchiveClassFactory
+
+wxArchiveClassFactory *wxArchiveClassFactory::sm_first = NULL;
+
+void wxArchiveClassFactory::Remove()
+{
+    if (m_next != this)
+    {
+        wxArchiveClassFactory **pp = &sm_first;
+
+        while (*pp != this)
+            pp = &(*pp)->m_next;
+
+        *pp = m_next;
+
+        m_next = this;
+    }
+}
+
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS