Define wxUSE_NOTEBOOK for Mac. Required ny sizer.

[wxWidgets.git] / include / wx / html / htmlpars.h

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index bc098ba42b7a763e6d132b0e62f8015d39c2e264..77e091e5a3b8071e76869f7c8255a47439d46e52 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:
     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;}
         virtual ~wxHtmlParser();
 
         void SetFS(wxFileSystem *fs) {m_FS = fs;}


@@ -70,18 +70,25 @@ class WXDLLEXPORT wxHtmlParser : public wxObject
 
         virtual void AddTagHandler(wxHtmlTagHandler *handler);
                 // adds handler to the list & hash table of handlers.
 
         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;}
 
 
         wxString* GetSource() {return &m_Source;}
 

-        virtual wxList* GetTempData() {return NULL;}
-                // this method returns list of wxObjects that represents
-                // all data allocated by the parser. These can't be freeded
-                // by destructor because they must be valid as long as
-                // GetProduct's return value is valid - the caller must
-                // explicitly call delete MyParser -> GetTempData() to free
-                // the memory
-                // (this method always sets the list to delete its contents)
-

     protected:
 
         virtual void AddText(const char* txt) = 0;
     protected:
 
         virtual void AddText(const char* txt) = 0;


@@ -117,6 +124,8 @@ class WXDLLEXPORT wxHtmlParser : public wxObject
                 //      only one reference to each handler instance.
         wxFileSystem *m_FS;
                 // class for opening files (file system)
                 //      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

 
 };
 
 
 };
 


@@ -165,7 +174,7 @@ class WXDLLEXPORT wxHtmlTagHandler : public wxObject
                 //                  FALSE etherwise
 
     protected:
                 //                  FALSE etherwise
 
     protected:

-        void ParseInner(const wxHtmlTag& tag) {m_Parser -> DoParsing(tag.GetBeginPos(), tag.GetEndPos1());}
+        void ParseInner(const wxHtmlTag& tag) {m_Parser->DoParsing(tag.GetBeginPos(), tag.GetEndPos1());}

                 // parses input between beginning and ending tag.
                 // m_Parser must be set.
 };
                 // parses input between beginning and ending tag.
                 // m_Parser must be set.
 };