wxBestHelpController now used as default on Windows

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

diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h
index 38aca9f6726a3259be738eab59b19f1469fe55b6..42cb66f95fdd6a9dddae1c2de65930e544abb608 100644 (file)
--- a/include/wx/html/forcelnk.h
+++ b/include/wx/html/forcelnk.h
@@ -44,8 +44,8 @@ See mod_*.cpp and htmlwin.cpp for example :-)
 
 // 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 ()                 \
+                int _wx_link_dummy_func_##module_name ();             \
+                int _wx_link_dummy_func_##module_name ()              \
                 {                                                     \
                     return 1;                                         \
                 }
@@ -53,9 +53,9 @@ See mod_*.cpp and htmlwin.cpp for example :-)
 
 // 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 ();
+                extern int _wx_link_dummy_func_##module_name ();      \
+                static int _wx_link_dummy_var_##module_name =         \
+                               _wx_link_dummy_func_##module_name ();
 
 #define FORCE_WXHTML_MODULES() \
     FORCE_LINK(m_layout) \
@@ -67,7 +67,6 @@ See mod_*.cpp and htmlwin.cpp for example :-)
     FORCE_LINK(m_hline) \
     FORCE_LINK(m_links) \
     FORCE_LINK(m_tables) \
-    FORCE_LINK(m_meta) \
     FORCE_LINK(m_style)