X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..16a6b53ddc74d62fd1b6b82651d0e3859580c48a:/include/wx/html/forcelnk.h diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h index 67feb65125..8cb3e9662f 100644 --- a/include/wx/html/forcelnk.h +++ b/include/wx/html/forcelnk.h @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) Vaclav Slavik -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /* @@ -40,22 +40,11 @@ See mod_*.cpp and htmlwin.cpp for example :-) #ifndef _WX_FORCELNK_H_ #define _WX_FORCELNK_H_ +#include "wx/link.h" - -// This must be part of the module you want to force: -#define FORCE_LINK_ME(module_name) \ - int _wx_link_dummy_func_##module_name (); \ - int _wx_link_dummy_func_##module_name () \ - { \ - return 1; \ - } - - -// And this must be somewhere where it certainly will be linked: -#define FORCE_LINK(module_name) \ - extern int _wx_link_dummy_func_##module_name (); \ - static int _wx_link_dummy_var_##module_name = \ - _wx_link_dummy_func_##module_name (); +// compatibility defines +#define FORCE_LINK wxFORCE_LINK_MODULE +#define FORCE_LINK_ME wxFORCE_LINK_THIS_MODULE #define FORCE_WXHTML_MODULES() \ FORCE_LINK(m_layout) \