no real changes, just refactor to remove some code duplication in wxToolBarTool

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

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 044498de116ed186d141933c8a569ff683248d95..e6962a7784a0a0a77fba4385ee436e302f3a1510 100644 (file)
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -16,18 +16,10 @@
 
 #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
 
 
 #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
 

-#ifndef WX_PRECOMP
-#endif
-

 #include "wx/archive.h"
 #include "wx/archive.h"

-#include "wx/link.h"

 
 IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
 
 IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)

-IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxObject)
-
-#if wxUSE_ZIPSTREAM
-wxFORCE_LINK_MODULE(zipstrm)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase)

 
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////


@@ -40,6 +32,13 @@ wxArchiveInputStream::wxArchiveInputStream(wxInputStream& stream,
 {
 }
 
 {
 }
 

+wxArchiveInputStream::wxArchiveInputStream(wxInputStream *stream,
+                                           wxMBConv& conv)
+  : wxFilterInputStream(stream),
+    m_conv(conv)
+{
+}
+

 
 /////////////////////////////////////////////////////////////////////////////
 // wxArchiveOutputStream
 
 /////////////////////////////////////////////////////////////////////////////
 // wxArchiveOutputStream


@@ -51,6 +50,13 @@ wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream& stream,
 {
 }
 
 {
 }
 

+wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream *stream,
+                                             wxMBConv& conv)
+  : wxFilterOutputStream(stream),
+    m_conv(conv)
+{
+}
+

 
 /////////////////////////////////////////////////////////////////////////////
 // wxArchiveEntry
 
 /////////////////////////////////////////////////////////////////////////////
 // wxArchiveEntry


@@ -68,4 +74,25 @@ wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
     return *this;
 }
 
     return *this;
 }
 

+
+/////////////////////////////////////////////////////////////////////////////
+// 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
 #endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS