Get rid of inline C compatibility methods

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

diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index cffb72f2113b9692bd8b7337c2255d6b79d4ffb9..2bb0943877ae48a69e5e5ae000f4c0442e08d832 100644 (file)
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -4,15 +4,15 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_HTMLFILT_H_
 #define _WX_HTMLFILT_H_
 

-#ifdef __GNUG__
-#pragma interface 
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "htmlfilt.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -30,19 +30,20 @@
 //                  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)
 

-    public:
-        wxHtmlFilter() : wxObject() {}
+public:
+    wxHtmlFilter() : wxObject() {}
+    virtual ~wxHtmlFilter() {}

 
 

-        virtual bool CanRead(const wxFSFile& file) const = 0;
-                // 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;

 
 

-        virtual wxString ReadFile(const wxFSFile& file) const = 0;
-                // reads given file and returns HTML document.
-                // Returns empty string if opening failed
+    // Reads given file and returns HTML document.
+    // Returns empty string if opening failed
+    virtual wxString ReadFile(const wxFSFile& file) const = 0;

 };
 
 
 };
 
 


@@ -55,10 +56,24 @@ class WXDLLEXPORT wxHtmlFilter : public wxObject
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
 
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
 

+public:
+    virtual bool CanRead(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;
     public:
         virtual bool CanRead(const wxFSFile& file) const;
         virtual wxString ReadFile(const wxFSFile& file) const;


@@ -66,6 +81,7 @@ class WXDLLEXPORT wxHtmlFilterPlainText : public wxHtmlFilter
 
 
 
 
 
 

-#endif
+#endif // wxUSE_HTML
+

 #endif // _WX_HTMLFILT_H_
 
 #endif // _WX_HTMLFILT_H_