Use of blobs with a binding to a SQL_C_BINARY type column definition was not working...

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index c45c2dfa29b3ec409aeb66cd7efd2e8d75d74f52..2bfef86812d478a58ffb525f48ef65ba547b80cf 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -8,8 +8,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
-#pragma implementation
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "htmlpars.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -17,7 +17,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -35,6 +35,14 @@
 #include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 
 #include "wx/dynarray.h"
 #include "wx/arrimpl.cpp"
 

+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()
+#endif
+
+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxHTML")
+

 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxHtmlParser helpers
 //-----------------------------------------------------------------------------


@@ -49,8 +57,9 @@ public:
 WX_DECLARE_OBJARRAY(wxHtmlTextPiece, wxHtmlTextPieces);
 WX_DEFINE_OBJARRAY(wxHtmlTextPieces);
 
 WX_DECLARE_OBJARRAY(wxHtmlTextPiece, wxHtmlTextPieces);
 WX_DEFINE_OBJARRAY(wxHtmlTextPieces);
 

-struct wxHtmlParserState
+class wxHtmlParserState

 {
 {

+public:

     wxHtmlTag         *m_curTag;
     wxHtmlTag         *m_tags;
     wxHtmlTextPieces  *m_textPieces;
     wxHtmlTag         *m_curTag;
     wxHtmlTag         *m_tags;
     wxHtmlTextPieces  *m_textPieces;


@@ -79,22 +88,28 @@ wxHtmlParser::wxHtmlParser()
 
 wxHtmlParser::~wxHtmlParser()
 {
 
 wxHtmlParser::~wxHtmlParser()
 {

-    while (RestoreState())
-        DestroyDOMTree();
+    while (RestoreState()) {}
+    DestroyDOMTree();
+
+    if (m_HandlersStack)
+    {
+        wxList& tmp = *m_HandlersStack;
+        wxList::iterator it, en;
+        for( it = tmp.begin(), en = tmp.end(); it != en; ++it )
+            delete (wxHashTable*)*it;
+        tmp.clear();
+    }

     delete m_HandlersStack;
     m_HandlersHash.Clear();
     delete m_HandlersStack;
     m_HandlersHash.Clear();

-    m_HandlersList.DeleteContents(TRUE);
-    m_HandlersList.Clear();
+    WX_CLEAR_LIST(wxList, m_HandlersList);

     delete m_entitiesParser;
 }
 
 wxObject* wxHtmlParser::Parse(const wxString& source)
 {
     delete m_entitiesParser;
 }
 
 wxObject* wxHtmlParser::Parse(const wxString& source)
 {

-    wxObject *result;
-

     InitParser(source);
     DoParsing();
     InitParser(source);
     DoParsing();

-    result = GetProduct();
+    wxObject *result = GetProduct();

     DoneParser();
     return result;
 }
     DoneParser();
     return result;
 }


@@ -102,6 +117,7 @@ wxObject* wxHtmlParser::Parse(const wxString& source)
 void wxHtmlParser::InitParser(const wxString& source)
 {
     SetSource(source);
 void wxHtmlParser::InitParser(const wxString& source)
 {
     SetSource(source);

+    m_stopParsing = FALSE;

 }
 
 void wxHtmlParser::DoneParser()
 }
 
 void wxHtmlParser::DoneParser()


@@ -126,6 +142,8 @@ void wxHtmlParser::CreateDOMTree()
     m_CurTextPiece = 0;
 }
 
     m_CurTextPiece = 0;
 }
 

+extern bool wxIsCDATAElement(const wxChar *tag);
+

 void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
                                     int begin_pos, int end_pos,
                                     wxHtmlTagsCache *cache)
 void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
                                     int begin_pos, int end_pos,
                                     wxHtmlTagsCache *cache)


@@ -135,7 +153,16 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
     wxChar c;
     int i = begin_pos;
     int textBeginning = begin_pos;
     wxChar c;
     int i = begin_pos;
     int textBeginning = begin_pos;

-    
+
+    // If the tag contains CDATA text, we include the text between beginning
+    // and ending tag verbosely. Setting i=end_pos will skip to the very
+    // end of this function where text piece is added, bypassing any child
+    // tags parsing (CDATA element can't have child elements by definition):
+    if (cur != NULL && wxIsCDATAElement(cur->GetName().c_str()))
+    {
+        i = end_pos;
+    }
+

     while (i < end_pos)
     {
         c = m_Source.GetChar(i);
     while (i < end_pos)
     {
         c = m_Source.GetChar(i);


@@ -159,7 +186,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
                 while (i < end_pos)
                 {
                     c = m_Source.GetChar(i++);
                 while (i < end_pos)
                 {
                     c = m_Source.GetChar(i++);

-                    if ((c == wxT(' ') || c == wxT('\n') || 
+                    if ((c == wxT(' ') || c == wxT('\n') ||

                         c == wxT('\r') || c == wxT('\t')) && dashes >= 2) {}
                     else if (c == wxT('>') && dashes >= 2)
                     {
                         c == wxT('\r') || c == wxT('\t')) && dashes >= 2) {}
                     else if (c == wxT('>') && dashes >= 2)
                     {


@@ -168,31 +195,31 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
                     }
                     else if (c == wxT('-'))
                         dashes++;
                     }
                     else if (c == wxT('-'))
                         dashes++;

-                    else    
+                    else

                         dashes = 0;
                 }
             }
                         dashes = 0;
                 }
             }

-        
+

             // add another tag to the tree:
             else if (i < end_pos-1 && m_Source.GetChar(i+1) != wxT('/'))
                {
                 wxHtmlTag *chd;
             // add another tag to the tree:
             else if (i < end_pos-1 && m_Source.GetChar(i+1) != wxT('/'))
                {
                 wxHtmlTag *chd;

-                if (cur) 
-                    chd = new wxHtmlTag(cur, m_Source, 
+                if (cur)
+                    chd = new wxHtmlTag(cur, m_Source,

                                         i, end_pos, cache, m_entitiesParser);
                                         i, end_pos, cache, m_entitiesParser);

-                else 
+                else

                 {
                     chd = new wxHtmlTag(NULL, m_Source,
                                         i, end_pos, cache, m_entitiesParser);
                 {
                     chd = new wxHtmlTag(NULL, m_Source,
                                         i, end_pos, cache, m_entitiesParser);

-                    if (!m_Tags) 
+                    if (!m_Tags)

                     {
                     {

-                        // if this is the first tag to be created make the root 
+                        // if this is the first tag to be created make the root

                         // m_Tags point to it:
                         m_Tags = chd;
                     }
                     else
                     {
                         // m_Tags point to it:
                         m_Tags = chd;
                     }
                     else
                     {

-                        // if there is already a root tag add this tag as 
+                        // if there is already a root tag add this tag as

                         // the last sibling:
                         chd->m_Prev = m_Tags->GetLastSibling();
                         chd->m_Prev->m_Next = chd;
                         // the last sibling:
                         chd->m_Prev = m_Tags->GetLastSibling();
                         chd->m_Prev->m_Next = chd;


@@ -202,17 +229,18 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
                 if (chd->HasEnding())
                 {
                     CreateDOMSubTree(chd,
                 if (chd->HasEnding())
                 {
                     CreateDOMSubTree(chd,

-                                     chd->GetBeginPos(), chd->GetEndPos1(), 
+                                     chd->GetBeginPos(), chd->GetEndPos1(),

                                      cache);
                     i = chd->GetEndPos2();
                 }
                 else
                     i = chd->GetBeginPos();
                                      cache);
                     i = chd->GetEndPos2();
                 }
                 else
                     i = chd->GetBeginPos();

+                

                 textBeginning = i;
             }
 
             // ... or skip ending tag:
                 textBeginning = i;
             }
 
             // ... or skip ending tag:

-            else 
+            else

             {
                 while (i < end_pos && m_Source.GetChar(i) != wxT('>')) i++;
                 textBeginning = i+1;
             {
                 while (i < end_pos && m_Source.GetChar(i) != wxT('>')) i++;
                 textBeginning = i+1;


@@ -243,36 +271,37 @@ void wxHtmlParser::DestroyDOMTree()
     m_TextPieces = NULL;
 }
 
     m_TextPieces = NULL;
 }
 

-void wxHtmlParser::DoParsing() 
+void wxHtmlParser::DoParsing()

 {
     m_CurTag = m_Tags;
     m_CurTextPiece = 0;
 {
     m_CurTag = m_Tags;
     m_CurTextPiece = 0;

-    DoParsing(0, m_Source.Length()); 
+    DoParsing(0, m_Source.Length());

 }
 
 void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 {
     if (end_pos <= begin_pos) return;
 }
 
 void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
 {
     if (end_pos <= begin_pos) return;

-    
+

     wxHtmlTextPieces& pieces = *m_TextPieces;
     size_t piecesCnt = pieces.GetCount();
     wxHtmlTextPieces& pieces = *m_TextPieces;
     size_t piecesCnt = pieces.GetCount();

-    
+

     while (begin_pos < end_pos)
     {
         while (m_CurTag && m_CurTag->GetBeginPos() < begin_pos)
             m_CurTag = m_CurTag->GetNextTag();
     while (begin_pos < end_pos)
     {
         while (m_CurTag && m_CurTag->GetBeginPos() < begin_pos)
             m_CurTag = m_CurTag->GetNextTag();

-        while (m_CurTextPiece < piecesCnt && 
+        while (m_CurTextPiece < piecesCnt &&

                pieces[m_CurTextPiece].m_pos < begin_pos)
             m_CurTextPiece++;
 
                pieces[m_CurTextPiece].m_pos < begin_pos)
             m_CurTextPiece++;
 

-        if (m_CurTextPiece < piecesCnt && 
-            (!m_CurTag || 
+        if (m_CurTextPiece < piecesCnt &&
+            (!m_CurTag ||

              pieces[m_CurTextPiece].m_pos < m_CurTag->GetBeginPos()))
         {
             // Add text:
              pieces[m_CurTextPiece].m_pos < m_CurTag->GetBeginPos()))
         {
             // Add text:

-            AddText(m_Source.Mid(pieces[m_CurTextPiece].m_pos,
-                                 pieces[m_CurTextPiece].m_lng));
-            begin_pos = pieces[m_CurTextPiece].m_pos + 
+            AddText(GetEntitiesParser()->Parse(
+                       m_Source.Mid(pieces[m_CurTextPiece].m_pos,
+                                    pieces[m_CurTextPiece].m_lng)));
+            begin_pos = pieces[m_CurTextPiece].m_pos +

                         pieces[m_CurTextPiece].m_lng;
             m_CurTextPiece++;
         }
                         pieces[m_CurTextPiece].m_lng;
             m_CurTextPiece++;
         }


@@ -283,12 +312,14 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
             {
                 if (m_CurTag->HasEnding())
                     begin_pos = m_CurTag->GetEndPos2();
             {
                 if (m_CurTag->HasEnding())
                     begin_pos = m_CurTag->GetEndPos2();

-                else 
+                else

                     begin_pos = m_CurTag->GetBeginPos();
             }
             wxHtmlTag *t = m_CurTag;
             m_CurTag = m_CurTag->GetNextTag();
             AddTag(*t);
                     begin_pos = m_CurTag->GetBeginPos();
             }
             wxHtmlTag *t = m_CurTag;
             m_CurTag = m_CurTag->GetNextTag();
             AddTag(*t);

+            if (m_stopParsing)
+                return;

         }
         else break;
     }
         }
         else break;
     }


@@ -301,7 +332,11 @@ void wxHtmlParser::AddTag(const wxHtmlTag& tag)
 
     h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName());
     if (h)
 
     h = (wxHtmlTagHandler*) m_HandlersHash.Get(tag.GetName());
     if (h)

+    {

         inner = h->HandleTag(tag);
         inner = h->HandleTag(tag);

+        if (m_stopParsing)
+            return;
+    }

     if (!inner)
     {
         if (tag.HasEnding())
     if (!inner)
     {
         if (tag.HasEnding())


@@ -315,7 +350,7 @@ void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
     wxStringTokenizer tokenizer(s, wxT(", "));
 
     while (tokenizer.HasMoreTokens())
     wxStringTokenizer tokenizer(s, wxT(", "));
 
     while (tokenizer.HasMoreTokens())

-        m_HandlersHash.Put(tokenizer.NextToken(), handler);
+        m_HandlersHash.Put(tokenizer.GetNextToken(), handler);

 
     if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
         m_HandlersList.Append(handler);
 
     if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
         m_HandlersList.Append(handler);


@@ -331,14 +366,13 @@ void wxHtmlParser::PushTagHandler(wxHtmlTagHandler *handler, wxString tags)
     if (m_HandlersStack == NULL)
     {
         m_HandlersStack = new wxList;
     if (m_HandlersStack == NULL)
     {
         m_HandlersStack = new wxList;

-        m_HandlersStack->DeleteContents(TRUE);

     }
 
     }
 

-    m_HandlersStack->Insert(new wxHashTable(m_HandlersHash));
+    m_HandlersStack->Insert((wxObject*)new wxHashTable(m_HandlersHash));

 
     while (tokenizer.HasMoreTokens())
     {
 
     while (tokenizer.HasMoreTokens())
     {

-        key = tokenizer.NextToken();
+        key = tokenizer.GetNextToken();

         m_HandlersHash.Delete(key);
         m_HandlersHash.Put(key, handler);
     }
         m_HandlersHash.Delete(key);
         m_HandlersHash.Put(key, handler);
     }


@@ -346,16 +380,22 @@ void wxHtmlParser::PushTagHandler(wxHtmlTagHandler *handler, wxString tags)
 
 void wxHtmlParser::PopTagHandler()
 {
 
 void wxHtmlParser::PopTagHandler()
 {

-    wxNode *first;
-
-    if (m_HandlersStack == NULL ||
-        (first = m_HandlersStack->GetFirst()) == NULL)
+    wxList::compatibility_iterator first;
+
+    if ( !m_HandlersStack ||
+#if wxUSE_STL
+         !(first = m_HandlersStack->GetFirst())
+#else // !wxUSE_STL
+         ((first = m_HandlersStack->GetFirst()) == NULL)
+#endif // wxUSE_STL/!wxUSE_STL
+        )

     {
         wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
         return;
     }
     m_HandlersHash = *((wxHashTable*) first->GetData());
     {
         wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
         return;
     }
     m_HandlersHash = *((wxHashTable*) first->GetData());

-    m_HandlersStack->DeleteNode(first);
+    delete (wxHashTable*) first->GetData();
+    m_HandlersStack->Erase(first);

 }
 
 void wxHtmlParser::SetSourceAndSaveState(const wxString& src)
 }
 
 void wxHtmlParser::SetSourceAndSaveState(const wxString& src)


@@ -376,23 +416,25 @@ void wxHtmlParser::SetSourceAndSaveState(const wxString& src)
     m_TextPieces = NULL;
     m_CurTextPiece = 0;
     m_Source = wxEmptyString;
     m_TextPieces = NULL;
     m_CurTextPiece = 0;
     m_Source = wxEmptyString;

-    
+

     SetSource(src);
 }
 
 bool wxHtmlParser::RestoreState()
 {
     if (!m_SavedStates) return FALSE;
     SetSource(src);
 }
 
 bool wxHtmlParser::RestoreState()
 {
     if (!m_SavedStates) return FALSE;

-    
+
+    DestroyDOMTree();
+

     wxHtmlParserState *s = m_SavedStates;
     m_SavedStates = s->m_nextState;
     wxHtmlParserState *s = m_SavedStates;
     m_SavedStates = s->m_nextState;

-    
+

     m_CurTag = s->m_curTag;
     m_Tags = s->m_tags;
     m_TextPieces = s->m_textPieces;
     m_CurTextPiece = s->m_curTextPiece;
     m_Source = s->m_source;
     m_CurTag = s->m_curTag;
     m_Tags = s->m_tags;
     m_TextPieces = s->m_textPieces;
     m_CurTextPiece = s->m_curTextPiece;
     m_Source = s->m_source;

-    
+

     delete s;
     return TRUE;
 }
     delete s;
     return TRUE;
 }


@@ -427,12 +469,18 @@ wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
 void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
 {
 #if wxUSE_WCHAR_T && !wxUSE_UNICODE
 void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
 {
 #if wxUSE_WCHAR_T && !wxUSE_UNICODE

-    if (encoding == m_encoding) return;
+    if (encoding == m_encoding)
+        return;
+

     delete m_conv;
     delete m_conv;

-    m_conv = NULL;
+

     m_encoding = encoding;
     m_encoding = encoding;

-    if (m_encoding != wxFONTENCODING_SYSTEM)
+    if (m_encoding == wxFONTENCODING_SYSTEM)
+        m_conv = NULL;
+    else

         m_conv = new wxCSConv(wxFontMapper::GetEncodingName(m_encoding));
         m_conv = new wxCSConv(wxFontMapper::GetEncodingName(m_encoding));

+#else
+    (void) encoding;

 #endif
 }
 
 #endif
 }
 


@@ -441,6 +489,8 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input)
     const wxChar *c, *last;
     const wxChar *in_str = input.c_str();
     wxString output;
     const wxChar *c, *last;
     const wxChar *in_str = input.c_str();
     wxString output;

+    
+    output.reserve(input.length());

 
     for (c = in_str, last = in_str; *c != wxT('\0'); c++)
     {
 
     for (c = in_str, last = in_str; *c != wxT('\0'); c++)
     {


@@ -449,8 +499,11 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input)
             if (c - last > 0)
                 output.append(last, c - last);
             if (++c == wxT('\0')) break;
             if (c - last > 0)
                 output.append(last, c - last);
             if (++c == wxT('\0')) break;

+        

             wxString entity;
             const wxChar *ent_s = c;
             wxString entity;
             const wxChar *ent_s = c;

+            wxChar entity_char;
+        

             for (; (*c >= wxT('a') && *c <= wxT('z')) ||
                    (*c >= wxT('A') && *c <= wxT('Z')) ||
                    (*c >= wxT('0') && *c <= wxT('9')) ||
             for (; (*c >= wxT('a') && *c <= wxT('z')) ||
                    (*c >= wxT('A') && *c <= wxT('Z')) ||
                    (*c >= wxT('0') && *c <= wxT('9')) ||


@@ -458,7 +511,14 @@ wxString wxHtmlEntitiesParser::Parse(const wxString& input)
             entity.append(ent_s, c - ent_s);
             if (*c != wxT(';')) c--;
             last = c+1;
             entity.append(ent_s, c - ent_s);
             if (*c != wxT(';')) c--;
             last = c+1;

-            output << GetEntityChar(entity);
+            entity_char = GetEntityChar(entity);
+            if (entity_char)
+                output << entity_char;
+            else
+            {
+                output.append(ent_s-1, c-ent_s+2);
+                wxLogDebug(wxT("Unrecognized HTML entity: '%s'"), entity.c_str());
+            }

         }
     }
     if (*last != wxT('\0'))
         }
     }
     if (*last != wxT('\0'))


@@ -472,28 +532,28 @@ struct wxHtmlEntityInfo
     unsigned code;
 };
 
     unsigned code;
 };
 

-static int LINKAGEMODE compar_entity(const void *key, const void *item)
+extern "C" int LINKAGEMODE wxHtmlEntityCompare(const void *key, const void *item)

 {
     return wxStrcmp((wxChar*)key, ((wxHtmlEntityInfo*)item)->name);
 }
 
 {
     return wxStrcmp((wxChar*)key, ((wxHtmlEntityInfo*)item)->name);
 }
 

+#if !wxUSE_UNICODE

 wxChar wxHtmlEntitiesParser::GetCharForCode(unsigned code)
 {
 wxChar wxHtmlEntitiesParser::GetCharForCode(unsigned code)
 {

-#if wxUSE_UNICODE
-    return (wxChar)code;
-#elif wxUSE_WCHAR_T
+#if wxUSE_WCHAR_T

     char buf[2];
     wchar_t wbuf[2];
     wbuf[0] = (wchar_t)code;
     wbuf[1] = 0;
     wxMBConv *conv = m_conv ? m_conv : &wxConvLocal;
     char buf[2];
     wchar_t wbuf[2];
     wbuf[0] = (wchar_t)code;
     wbuf[1] = 0;
     wxMBConv *conv = m_conv ? m_conv : &wxConvLocal;

-    if (conv->WC2MB(buf, wbuf, 1) == (size_t)-1)
+    if (conv->WC2MB(buf, wbuf, 2) == (size_t)-1)

         return '?';
     return buf[0];
 #else
     return (code < 256) ? (wxChar)code : '?';
 #endif
 }
         return '?';
     return buf[0];
 #else
     return (code < 256) ? (wxChar)code : '?';
 #endif
 }

+#endif

 
 wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity)
 {
 
 wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity)
 {


@@ -782,15 +842,86 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity)
         info = (wxHtmlEntityInfo*) bsearch(entity.c_str(), substitutions,
                                            substitutions_cnt,
                                            sizeof(wxHtmlEntityInfo),
         info = (wxHtmlEntityInfo*) bsearch(entity.c_str(), substitutions,
                                            substitutions_cnt,
                                            sizeof(wxHtmlEntityInfo),

-                                           compar_entity);
+                                           wxHtmlEntityCompare);

         if (info)
             code = info->code;
     }
 
     if (code == 0)
         if (info)
             code = info->code;
     }
 
     if (code == 0)

-        return wxT('?');
+        return 0;

     else
         return GetCharForCode(code);
 }
 
     else
         return GetCharForCode(code);
 }
 

+wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type), 
+                                const wxString& url) const
+{
+    return m_FS ? m_FS->OpenFile(url) : NULL;
+    
+}
+
+
+//-----------------------------------------------------------------------------
+// wxHtmlParser::ExtractCharsetInformation
+//-----------------------------------------------------------------------------
+
+class wxMetaTagParser : public wxHtmlParser
+{
+public:
+    wxMetaTagParser() { }
+
+    wxObject* GetProduct() { return NULL; }
+
+protected:
+    virtual void AddText(const wxChar* WXUNUSED(txt)) {}
+
+    DECLARE_NO_COPY_CLASS(wxMetaTagParser)
+};
+
+class wxMetaTagHandler : public wxHtmlTagHandler
+{
+public:
+    wxMetaTagHandler(wxString *retval) : wxHtmlTagHandler(), m_retval(retval) {}
+    wxString GetSupportedTags() { return wxT("META,BODY"); }
+    bool HandleTag(const wxHtmlTag& tag);
+
+private:
+    wxString *m_retval;
+
+    DECLARE_NO_COPY_CLASS(wxMetaTagHandler)
+};
+
+bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
+{
+    if (tag.GetName() == _T("BODY"))
+    {
+        m_Parser->StopParsing();
+        return FALSE;
+    }
+
+    if (tag.HasParam(_T("HTTP-EQUIV")) &&
+        tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) &&
+        tag.HasParam(_T("CONTENT")))
+    {
+        wxString content = tag.GetParam(_T("CONTENT")).Lower();
+        if (content.Left(19) == _T("text/html; charset="))
+        {
+            *m_retval = content.Mid(19);
+            m_Parser->StopParsing();
+        }
+    }
+    return FALSE;
+}
+
+
+/*static*/
+wxString wxHtmlParser::ExtractCharsetInformation(const wxString& markup)
+{
+    wxString charset;
+    wxMetaTagParser parser;
+    parser.AddTagHandler(new wxMetaTagHandler(&charset));
+    parser.Parse(markup);
+    return charset;
+}
+

 #endif
 #endif