Use NSBox with the NSBoxSeparator box type

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 9ed716fe817cb391a17355eccf01a519e5e61da6..9718c67ee37d7ee5e45979a1364e2e417e21c520 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "htmlpars.h"
 #endif
 
 #pragma implementation "htmlpars.h"
 #endif
 


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

+
+// DLL options compatibility check:
+#include "wx/app.h"
+WX_CHECK_BUILD_OPTIONS("wxHTML")
+

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


@@ -82,11 +87,18 @@ 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;
 }
 
     delete m_entitiesParser;
 }
 


@@ -127,6 +139,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)


@@ -137,6 +151,15 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
     int i = begin_pos;
     int textBeginning = begin_pos;
 
     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);


@@ -209,6 +232,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
                 }
                 else
                     i = chd->GetBeginPos();
                 }
                 else
                     i = chd->GetBeginPos();

+                

                 textBeginning = i;
             }
 
                 textBeginning = i;
             }
 


@@ -339,10 +363,9 @@ 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())
     {


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

-    wxNode *first;
+    wxList::compatibility_iterator first;

 
 

-    if (m_HandlersStack == NULL ||
-        (first = m_HandlersStack->GetFirst()) == NULL)
+    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)


@@ -835,9 +864,14 @@ wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type),
 class wxMetaTagParser : public wxHtmlParser
 {
 public:
 class wxMetaTagParser : public wxHtmlParser
 {
 public:

+    wxMetaTagParser() { }
+

     wxObject* GetProduct() { return NULL; }
     wxObject* GetProduct() { return NULL; }

+

 protected:
     virtual void AddText(const wxChar* WXUNUSED(txt)) {}
 protected:
     virtual void AddText(const wxChar* WXUNUSED(txt)) {}

+
+    DECLARE_NO_COPY_CLASS(wxMetaTagParser)

 };
 
 class wxMetaTagHandler : public wxHtmlTagHandler
 };
 
 class wxMetaTagHandler : public wxHtmlTagHandler


@@ -849,6 +883,8 @@ public:
 
 private:
     wxString *m_retval;
 
 private:
     wxString *m_retval;

+
+    DECLARE_NO_COPY_CLASS(wxMetaTagHandler)

 };
 
 bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
 };
 
 bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)


@@ -860,7 +896,7 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
     }
 
     if (tag.HasParam(_T("HTTP-EQUIV")) &&
     }
 
     if (tag.HasParam(_T("HTTP-EQUIV")) &&

-        tag.GetParam(_T("HTTP-EQUIV")) == _T("Content-Type") &&
+        tag.GetParam(_T("HTTP-EQUIV")).IsSameAs(_T("Content-Type"), false) &&

         tag.HasParam(_T("CONTENT")))
     {
         wxString content = tag.GetParam(_T("CONTENT"));
         tag.HasParam(_T("CONTENT")))
     {
         wxString content = tag.GetParam(_T("CONTENT"));


@@ -884,5 +920,4 @@ wxString wxHtmlParser::ExtractCharsetInformation(const wxString& markup)
     return charset;
 }
 
     return charset;
 }
 

-

 #endif
 #endif