From 867be82e3aafa74dfabcf07c04dae763be96be29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 9 Nov 2002 00:23:46 +0000 Subject: [PATCH] tag handler no longer needed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 1 - include/wx/html/forcelnk.h | 1 - src/html/m_meta.cpp | 70 ---------------------------------- 3 files changed, 72 deletions(-) delete mode 100644 src/html/m_meta.cpp diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 9fc1ca09a1..58bee802b6 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -743,7 +743,6 @@ m_list.cpp HTML m_dflist.cpp HTML m_pre.cpp HTML m_tables.cpp HTML -m_meta.cpp HTML m_style.cpp HTML htmprint.cpp HTML diff --git a/include/wx/html/forcelnk.h b/include/wx/html/forcelnk.h index 38aca9f672..87c6b5a041 100644 --- a/include/wx/html/forcelnk.h +++ b/include/wx/html/forcelnk.h @@ -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) diff --git a/src/html/m_meta.cpp b/src/html/m_meta.cpp deleted file mode 100644 index 7f37ce0062..0000000000 --- a/src/html/m_meta.cpp +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: m_meta.cpp -// Purpose: wxHtml module for parsing tag -// Author: Vaclav Slavik -// RCS-ID: $Id$ -// Copyright: (c) 2000 Vaclav Slavik -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation -#endif - -#include "wx/wxprec.h" - - -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WXPRECOMP -#endif - -#include "wx/fontmap.h" -#include "wx/html/forcelnk.h" -#include "wx/html/m_templ.h" -#include "wx/html/htmlcell.h" - -FORCE_LINK_ME(m_meta) - - - - -TAG_HANDLER_BEGIN(META, wxT("META") ) - - TAG_HANDLER_PROC(tag) - { - if (tag.HasParam(_T("HTTP-EQUIV")) && - tag.GetParam(_T("HTTP-EQUIV")) == _T("Content-Type") && - tag.HasParam(_T("CONTENT"))) - { - wxString content = tag.GetParam(_T("CONTENT")); - if (content.Left(19) == _T("text/html; charset=")) - { - wxFontEncoding enc = - wxFontMapper::Get()->CharsetToEncoding(content.Mid(19)); - if (enc == wxFONTENCODING_SYSTEM) return FALSE; - if (enc == m_WParser->GetInputEncoding()) return FALSE; - - m_WParser->SetInputEncoding(enc); - m_WParser->GetContainer()->InsertCell( - new wxHtmlFontCell(m_WParser->CreateCurrentFont())); - } - } - return FALSE; - } - -TAG_HANDLER_END(META) - - -TAGS_MODULE_BEGIN(MetaTag) - - TAGS_MODULE_ADD(META) - -TAGS_MODULE_END(MetaTag) - -#endif