Added configure test for const_cast<>(), and enabled it

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

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index aef73949fb4a282cf6071c7d82d83d958cdb0cfc..bcb7a9a030d84daffa87b02f89c6da0465af304a 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLPARS_H_
 #define _WX_HTMLPARS_H_
 
 #ifndef _WX_HTMLPARS_H_
 #define _WX_HTMLPARS_H_
 

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

 #pragma interface "htmlpars.h"
 #endif
 
 #pragma interface "htmlpars.h"
 #endif
 


@@ -31,6 +31,14 @@ class WXDLLEXPORT wxHtmlEntitiesParser;
 class wxHtmlTextPieces;
 class wxHtmlParserState;
 
 class wxHtmlTextPieces;
 class wxHtmlParserState;
 

+
+enum wxHtmlURLType
+{
+    wxHTML_URL_PAGE,
+    wxHTML_URL_IMAGE,
+    wxHTML_URL_OTHER
+};
+

 // This class handles generic parsing of HTML document : it scans
 // the document and divide it into blocks of tags (where one block
 // consists of starting and ending tag and of text between these
 // This class handles generic parsing of HTML document : it scans
 // the document and divide it into blocks of tags (where one block
 // consists of starting and ending tag and of text between these


@@ -48,6 +56,10 @@ public:
 
     wxFileSystem* GetFS() const { return m_FS; }
 
 
     wxFileSystem* GetFS() const { return m_FS; }
 

+    // Opens file if the parser is allowed to open given URL (may be forbidden
+    // for security reasons)    
+    virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const;
+

     // You can simply call this method when you need parsed output.
     // This method does these things:
     // 1. call InitParser(source);
     // You can simply call this method when you need parsed output.
     // This method does these things:
     // 1. call InitParser(source);


@@ -60,6 +72,9 @@ public:
     virtual void InitParser(const wxString& source);
     // This must be called after Parse().
     virtual void DoneParser();
     virtual void InitParser(const wxString& source);
     // This must be called after Parse().
     virtual void DoneParser();

+    
+    // May be called during parsing to immediately return from Parse().
+    virtual void StopParsing() { m_stopParsing = TRUE; }

 
     // Parses the m_Source from begin_pos to end_pos-1.
     // (in noparams version it parses whole m_Source)
 
     // Parses the m_Source from begin_pos to end_pos-1.
     // (in noparams version it parses whole m_Source)


@@ -105,6 +120,11 @@ public:
     // Restores parser's state from stack or returns FALSE if the stack is
     // empty
     virtual bool RestoreState();
     // Restores parser's state from stack or returns FALSE if the stack is
     // empty
     virtual bool RestoreState();

+    
+    // Parses HTML string 'markup' and extracts charset info from <meta> tag
+    // if present. Returns empty string if the tag is missing.
+    // For wxHTML's internal use.
+    static wxString ExtractCharsetInformation(const wxString& markup);

 
 protected:
     // DOM structure
 
 protected:
     // DOM structure


@@ -154,6 +174,8 @@ protected:
     wxList m_HandlersList;
     wxHashTable m_HandlersHash;
 
     wxList m_HandlersList;
     wxHashTable m_HandlersHash;
 

+    DECLARE_NO_COPY_CLASS(wxHtmlParser)
+

     // class for opening files (file system)
     wxFileSystem *m_FS;
     // handlers stack used by PushTagHandler and PopTagHandler
     // class for opening files (file system)
     wxFileSystem *m_FS;
     // handlers stack used by PushTagHandler and PopTagHandler


@@ -161,6 +183,9 @@ protected:
     
     // entity parse
     wxHtmlEntitiesParser *m_entitiesParser;
     
     // entity parse
     wxHtmlEntitiesParser *m_entitiesParser;

+    
+    // flag indicating that the parser should stop
+    bool m_stopParsing;

 };
 
 
 };
 
 


@@ -205,6 +230,8 @@ protected:
         { m_Parser->DoParsing(tag.GetBeginPos(), tag.GetEndPos1()); }
 
     wxHtmlParser *m_Parser;
         { m_Parser->DoParsing(tag.GetBeginPos(), tag.GetEndPos1()); }
 
     wxHtmlParser *m_Parser;

+
+    DECLARE_NO_COPY_CLASS(wxHtmlTagHandler)

 };
 
 
 };
 
 


@@ -226,17 +253,23 @@ public:
     // (with respect to output encoding)
     wxString Parse(const wxString& input);
 
     // (with respect to output encoding)
     wxString Parse(const wxString& input);
 

-    // Returns character for given entity
+    // Returns character for given entity or 0 if the enity is unknown

     wxChar GetEntityChar(const wxString& entity);
 
     // Returns character that represents given Unicode code
     wxChar GetEntityChar(const wxString& entity);
 
     // Returns character that represents given Unicode code

+#if wxUSE_UNICODE
+    wxChar GetCharForCode(unsigned code) { return (wxChar)code; }
+#else

     wxChar GetCharForCode(unsigned code);
     wxChar GetCharForCode(unsigned code);

+#endif

 
 protected:
 #if wxUSE_WCHAR_T && !wxUSE_UNICODE
     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif
 
 protected:
 #if wxUSE_WCHAR_T && !wxUSE_UNICODE
     wxMBConv *m_conv;
     wxFontEncoding m_encoding;
 #endif

+
+    DECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser)

 };
 
 
 };