regenerated from the templates

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 1eb0d2a16678f8647fb39daa074bd06b98ed85b9..c029c706fc9fa94469069fd7aae0ab334bd42192 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -30,7 +30,6 @@
 #endif
 
 #include "wx/html/htmlwin.h"
-#include "wx/html/forcelnk.h"
 #include "wx/html/htmlproc.h"
 #include "wx/list.h"
 
@@ -636,13 +635,6 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
     if (m_tmpCanDrawLocks > 0) return;
 
     dc.SetMapMode(wxMM_TEXT);
-#if 0
-/* VS - I don't think this is neccessary any longer
-        MSC_VER 1200 means MSVC 6.0 and it works fine */
-#if defined(_MSC_VER) && (_MSC_VER == 1200)
-    ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT);
-#endif
-#endif
     dc.SetBackgroundMode(wxTRANSPARENT);
     GetViewStart(&x, &y);
 
@@ -686,6 +678,8 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
             wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
 
             // VZ: is it possible that we don't find anything at all?
+            // VS: yes. FindCellByPos returns terminal cell and
+            //     containers may have empty borders
             if ( cell )
                 OnCellClicked(cell, pos.x, pos.y, event);
         }
@@ -782,20 +776,9 @@ public:
 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