Second phase of OOR completed. (Original python object return for

[wxWidgets.git] / src / html / htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index d80cb51617deb3705265a09e122086261c688537..c029c706fc9fa94469069fd7aae0ab334bd42192 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -30,7 +30,6 @@
 #endif
 
 #include "wx/html/htmlwin.h"
 #endif
 
 #include "wx/html/htmlwin.h"

-#include "wx/html/forcelnk.h"

 #include "wx/html/htmlproc.h"
 #include "wx/list.h"
 
 #include "wx/html/htmlproc.h"
 #include "wx/list.h"
 


@@ -777,20 +776,9 @@ public:
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 
 

-
-
-///// default mod handlers are forced there:
-
-FORCE_LINK(m_layout)
-FORCE_LINK(m_fonts)
-FORCE_LINK(m_image)
-FORCE_LINK(m_list)
-FORCE_LINK(m_dflist)
-FORCE_LINK(m_pre)
-FORCE_LINK(m_hline)
-FORCE_LINK(m_links)
-FORCE_LINK(m_tables)
-FORCE_LINK(m_meta)
-
+// This hack forces the linker to always link in m_* files
+// (wxHTML doesn't work without handlers from these files)
+#include "wx/html/forcelnk.h"
+FORCE_WXHTML_MODULES()

 
 #endif
 
 #endif