adding support for wxCB_SORT

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

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 6420d948521813fec52e6327c54eba88f94c57db..8ba6b2f75b437bd00a38a6000a0c90e9bdbfc7b6 100644 (file)
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -22,15 +22,19 @@
   #include "wx/defs.h"
 #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)
+#if wxUSE_ZIPSTREAM
+//FORCE_LINK(zipstrm)
+extern int _wx_link_dummy_func_zipstrm();
+static int _wx_link_dummy_var_zipstrm =
+               _wx_link_dummy_func_zipstrm ();
+#endif
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -65,10 +69,10 @@ void wxArchiveEntry::SetNotifier(wxArchiveNotifier& notifier)
     m_notifier->OnEntryUpdated(*this);
 }
 
-wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& entry)
+wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
 {
-    m_notifier = entry.m_notifier;
+    m_notifier = NULL;
     return *this;
 }
 
-#endif
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS