Change wxSP_XXX flags values to avoid clashes with wxTE_XXX.

[wxWidgets.git] / include / wx / html / forcelnk.h

diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h
index 38aca9f6726a3259be738eab59b19f1469fe55b6..beee677d759d4b3ea723f58262f22adb09df4805 100644 (file)
--- a/include/wx/html/forcelnk.h
+++ b/include/wx/html/forcelnk.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        forcelnk.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        forcelnk.h

-// Purpose:     see bellow
+// Purpose:     macros which force the linker to link apparently unused code

 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik


@@ -40,22 +40,11 @@ See mod_*.cpp and htmlwin.cpp for example :-)
 #ifndef _WX_FORCELNK_H_
 #define _WX_FORCELNK_H_
 
 #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 _link_dummy_func_##module_name ();                \
-                int _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 _link_dummy_func_##module_name ();         \
-                static int _link_dummy_var_##module_name =            \
-                               _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) \
 
 #define FORCE_WXHTML_MODULES() \
     FORCE_LINK(m_layout) \


@@ -67,7 +56,7 @@ See mod_*.cpp and htmlwin.cpp for example :-)
     FORCE_LINK(m_hline) \
     FORCE_LINK(m_links) \
     FORCE_LINK(m_tables) \
     FORCE_LINK(m_hline) \
     FORCE_LINK(m_links) \
     FORCE_LINK(m_tables) \

-    FORCE_LINK(m_meta) \
+    FORCE_LINK(m_span) \

     FORCE_LINK(m_style)
 
 
     FORCE_LINK(m_style)