Merge new item attributes if any are already existing

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

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 22a053b4c46b8dccfc945cc5c7c901a19944a29b..044498de116ed186d141933c8a569ff683248d95 100644 (file)
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        archive.cpp
+// Name:        src/common/archive.cpp
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
@@ -7,30 +7,27 @@
 // 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
+    #pragma hdrstop
 #endif
 
+#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
+
 #ifndef WX_PRECOMP
-  #include "wx/defs.h"
 #endif
 
-#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
-
 #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 +68,4 @@ wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
     return *this;
 }
 
-#endif
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS