Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed dependency on wx/html/forcelnk.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-02-22 10:41:48 +00:00
parent 11f4a34413
commit 851b16b935
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/archive.cpp
View File

@@ -25,13 +25,15 @@
#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
#include "wx/archive.h" #include "wx/archive.h"
#include "wx/html/forcelnk.h"
IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxObject)
#if wxUSE_ZIPSTREAM #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 #endif

8
src/common/zipstrm.cpp
View File

@@ -34,7 +34,6 @@
#include "wx/buffer.h" #include "wx/buffer.h"
#include "wx/ptr_scpd.h" #include "wx/ptr_scpd.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/html/forcelnk.h"
#include "zlib.h" #include "zlib.h"
// value for the 'version needed to extract' field (20 means 2.0) // 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(wxZipEntry, wxArchiveEntry)
IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory) 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;
}
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////