fixes to menu stock items support (patch 1547639)

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

diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index 57c5b471873a3b0f76de60572079c589c94f1ded..4cddd88aea80d1ad1265a7ef8f878c14f5d22ad4 100644 (file)
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -4,17 +4,12 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef _WX_HTMLFILT_H_
 #define _WX_HTMLFILT_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "htmlfilt.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_HTML
@@ -30,7 +25,7 @@
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHtmlFilter : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject
 {
     DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
 
@@ -38,7 +33,7 @@ public:
     wxHtmlFilter() : wxObject() {}
     virtual ~wxHtmlFilter() {}
 
-    // returns TRUE if this filter is able to open&read given file
+    // returns true if this filter is able to open&read given file
     virtual bool CanRead(const wxFSFile& file) const = 0;
 
     // Reads given file and returns HTML document.
@@ -56,7 +51,7 @@ public:
 //--------------------------------------------------------------------------------
 
 
-class WXDLLEXPORT wxHtmlFilterPlainText : public wxHtmlFilter
+class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
 
@@ -65,6 +60,20 @@ public:
     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