fixed gcc warnings and reformatted some pieces of code to be a bit readable

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

diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h
index e755ebb1480294d01daff678cc0de75e035dc137..39435ac74fd64492afc3cdbc63ae3e89a3078efd 100644 (file)
--- a/include/wx/html/htmlfilt.h
+++ b/include/wx/html/htmlfilt.h
@@ -11,8 +11,8 @@
 #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"
@@ -30,22 +30,20 @@
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHtmlFilter : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject
 {
     DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
 
-    public:
-        wxHtmlFilter() : wxObject() {}
-#ifdef __WXMAC_X__
-               virtual ~wxHtmlFilter() {}
-#endif
+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;
 };
 
 
@@ -58,10 +56,24 @@ class WXDLLEXPORT wxHtmlFilter : public wxObject
 //--------------------------------------------------------------------------------
 
 
-class WXDLLEXPORT wxHtmlFilterPlainText : public wxHtmlFilter
+class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter
 {
     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;
@@ -69,6 +81,7 @@ class WXDLLEXPORT wxHtmlFilterPlainText : public wxHtmlFilter
 
 
 
-#endif
+#endif // wxUSE_HTML
+
 #endif // _WX_HTMLFILT_H_