fixed wxGetKeyState to get current status of non-togle keys, and to

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

diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index 975461d50a2f76b7dc6dad4292c03e8fa1b90cce..39435ac74fd64492afc3cdbc63ae3e89a3078efd 100644 (file)
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLFILT_H_
 #define _WX_HTMLFILT_H_
 
 #ifndef _WX_HTMLFILT_H_
 #define _WX_HTMLFILT_H_
 

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

 #pragma interface "htmlfilt.h"
 #endif
 
 #pragma interface "htmlfilt.h"
 #endif
 


@@ -30,7 +30,7 @@
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxHtmlFilter : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject

 {
     DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
 
 {
     DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
 


@@ -56,7 +56,7 @@ public:
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

-class WXDLLEXPORT wxHtmlFilterPlainText : public wxHtmlFilter
+class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter

 {
     DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
 
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
 


@@ -65,6 +65,20 @@ public:
     virtual wxString ReadFile(const wxFSFile& file) const;
 };
 
     virtual wxString ReadFile(const wxFSFile& file) const;
 };
 

+//--------------------------------------------------------------------------------
+// wxHtmlFilterHTML
+//          filter for text/html
+//--------------------------------------------------------------------------------
+
+class wxHtmlFilterHTML : public wxHtmlFilter
+{
+    DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML)
+
+    public:
+        virtual bool CanRead(const wxFSFile& file) const;
+        virtual wxString ReadFile(const wxFSFile& file) const;
+};
+

 
 
 #endif // wxUSE_HTML
 
 
 #endif // wxUSE_HTML