Removed dependency on wx/html/forcelnk.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index 8ad3fcc2bd2a95794a24f7a2588867484aa4d6e9..8ba6b2f75b437bd00a38a6000a0c90e9bdbfc7b6 100644 (file)
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -25,13 +25,15 @@
 #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)
 
 #if wxUSE_ZIPSTREAM
-FORCE_LINK(zipstrm)
+//FORCE_LINK(zipstrm)
+extern int _wx_link_dummy_func_zipstrm();
+static int _wx_link_dummy_var_zipstrm =
+               _wx_link_dummy_func_zipstrm ();
 #endif
 
 

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 63b941e3a4d9a19c78960d5ae1aafa50a3e67117..f9f9826428dc678dc707b157feb48cd6b2ab8a18 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -34,7 +34,6 @@
 #include "wx/buffer.h"
 #include "wx/ptr_scpd.h"
 #include "wx/wfstream.h"
-#include "wx/html/forcelnk.h"
 #include "zlib.h"
 
 // value for the 'version needed to extract' field (20 means 2.0)
@@ -82,7 +81,12 @@ enum {
 IMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry)
 IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory)
 
-FORCE_LINK_ME(zipstrm)
+//FORCE_LINK_ME(zipstrm)
+int _wx_link_dummy_func_zipstrm();
+int _wx_link_dummy_func_zipstrm()
+{
+    return 1;
+}
 
 
 /////////////////////////////////////////////////////////////////////////////