Move some OLE utilities to oleutils.cpp and simplified date conversion

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

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 22a053b4c46b8dccfc945cc5c7c901a19944a29b..757425b2777ed57393c6e07d56f23cc12047c0f9 100644 (file)
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -7,10 +7,6 @@
 // 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"
 
@@ -22,15 +18,17 @@
   #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"
+#include "wx/link.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxObject)
 
-FORCE_LINK(zipstrm)
+#if wxUSE_ZIPSTREAM
+wxFORCE_LINK_MODULE(zipstrm)
+#endif
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -71,4 +69,4 @@ wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
     return *this;
 }
 
-#endif
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS