added wxHtmlParser::{Push|Pop}TagHandler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index bc098ba42b7a763e6d132b0e62f8015d39c2e264..acf972ff427d06ae245745e27f1fb4d5a1d233c3 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -37,7 +37,7 @@ class WXDLLEXPORT wxHtmlParser : public wxObject
     DECLARE_ABSTRACT_CLASS(wxHtmlParser)
 
     public:
-        wxHtmlParser() : wxObject(), m_HandlersHash(wxKEY_STRING) {m_FS = NULL; m_Cache = NULL;}
+        wxHtmlParser() : wxObject(), m_HandlersHash(wxKEY_STRING) {m_FS = NULL; m_Cache = NULL; m_HandlersStack = NULL;}
         virtual ~wxHtmlParser();
 
         void SetFS(wxFileSystem *fs) {m_FS = fs;}
@@ -70,6 +70,22 @@ class WXDLLEXPORT wxHtmlParser : public wxObject
 
         virtual void AddTagHandler(wxHtmlTagHandler *handler);
                 // adds handler to the list & hash table of handlers.
+                
+        void PushTagHandler(wxHtmlTagHandler *handler, wxString tags);
+                // Forces the handler to handle additional tags (not returned by GetSupportedTags). 
+                // The handler should already be in use by this parser.
+                // Example: you want to parse following pseudo-html structure:
+                //   <myitems>
+                //     <it name="one" value="1">
+                //     <it name="two" value="2">
+                //   </myitems>
+                //   <it> This last it has different meaning, we don't want it to be parsed by myitems handler!
+                // handler can handle only 'myitems' (e.g. it's GetSupportedTags returns "MYITEMS")
+                // you can call PushTagHandler(handler, "IT") when you find <myitems>
+                // and call PopTagHandler() when you find </myitems>
+                
+        void PopTagHandler();
+                // Restores state before last call to PushTagHandler
 
         wxString* GetSource() {return &m_Source;}
 
@@ -117,6 +133,8 @@ class WXDLLEXPORT wxHtmlParser : public wxObject
                 //      only one reference to each handler instance.
         wxFileSystem *m_FS;
                 // class for opening files (file system)
+        wxList *m_HandlersStack;
+                // handlers stack used by PushTagHandler and PopTagHandler
 
 };
 

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index da21362a5ec1db8d1c11ad39fbe465d98a3ad9d3..1d9b99c7f6267dea5863b8e47fdf48724dd23bb7 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -148,8 +148,41 @@ void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
 
 
 
+void wxHtmlParser::PushTagHandler(wxHtmlTagHandler *handler, wxString tags)
+{
+    wxStringTokenizer tokenizer(tags, ", ");
+    wxString key;
+
+    if (m_HandlersStack == NULL) {
+        m_HandlersStack = new wxList;
+        m_HandlersStack -> DeleteContents(TRUE);
+    }
+
+    m_HandlersStack -> Insert(new wxHashTable(m_HandlersHash));
+
+    while (tokenizer.HasMoreTokens()) {
+        key = tokenizer.NextToken();
+        m_HandlersHash.Delete(key);
+        m_HandlersHash.Put(key, handler);
+    }
+}
+
+
+
+void wxHtmlParser::PopTagHandler()
+{
+    wxNode *first;
+    
+    if (m_HandlersStack == NULL || (first = m_HandlersStack -> GetFirst()) == NULL) return;
+    m_HandlersHash = *((wxHashTable*) first -> GetData());
+    m_HandlersStack -> DeleteNode(first);
+}
+
+
+
 wxHtmlParser::~wxHtmlParser()
 {
+    if (m_HandlersStack) delete m_HandlersStack;
     m_HandlersHash.Clear();
     m_HandlersList.DeleteContents(TRUE);
     m_HandlersList.Clear();