changes to make wxGTK compile with GTK+ 2.0: now it does but the minimal

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

diff --git a/include/wx/html/htmlpars.h b/include/wx/html/htmlpars.h
index e28657879fcfc788411d58beb2d2a885e8ec92b4..a7f067b5a1dce8ec649e7ac33f824098f3ab6d98 100644 (file)
--- a/include/wx/html/htmlpars.h
+++ b/include/wx/html/htmlpars.h
@@ -20,6 +20,8 @@
 
 #include "wx/html/htmltag.h"
 #include "wx/filesys.h"
 
 #include "wx/html/htmltag.h"
 #include "wx/filesys.h"

+#include "wx/hash.h"
+#include "wx/fontenc.h"

 
 class WXDLLEXPORT wxMBConv;
 class WXDLLEXPORT wxHtmlParser;
 
 class WXDLLEXPORT wxMBConv;
 class WXDLLEXPORT wxHtmlParser;


@@ -29,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


@@ -46,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);


@@ -223,11 +237,14 @@ public:
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)
     wxString Parse(const wxString& input);
     // Parses entities in input and replaces them with respective characters
     // (with respect to output encoding)
     wxString Parse(const wxString& input);

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

     wxChar GetEntityChar(const wxString& entity);
     wxChar GetEntityChar(const wxString& entity);

+
+    // Returns character that represents given Unicode code

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

+protected:

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