X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d168485fcfaa772a9573a51a461c0209753fe971..c5c528fc7fc25fc4381db46bcb51dd408ce7cf89:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index d80cb51617..0f5fc11366 100644 --- 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" @@ -198,6 +197,10 @@ bool wxHtmlWindow::SetPage(const wxString& source) return TRUE; } +bool wxHtmlWindow::AppendToPage(const wxString& source) +{ + return SetPage(*(GetParser()->GetSource()) + source); +} bool wxHtmlWindow::LoadPage(const wxString& location) { @@ -615,7 +618,7 @@ void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) void wxHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event) -{ +{ wxCHECK_RET( cell, _T("can't be called with NULL cell") ); cell->OnMouseClick(this, x, y, event); @@ -777,20 +780,9 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) +// 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() - -///// 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) - - -#endif +#endif \ No newline at end of file