X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/214b7e74f0d6e46fc278d0060b2e864a23f1714e..8a646b6b9f7593b433a328ce644f5f274685b356:/include/wx/html/htmlfilt.h diff --git a/include/wx/html/htmlfilt.h b/include/wx/html/htmlfilt.h index e755ebb148..57c5b47187 100644 --- 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(__APPLE__) +#pragma interface "htmlfilt.h" #endif #include "wx/defs.h" @@ -34,18 +34,16 @@ class WXDLLEXPORT 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; }; @@ -62,13 +60,14 @@ class WXDLLEXPORT wxHtmlFilterPlainText : public wxHtmlFilter { DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText) - 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; }; -#endif +#endif // wxUSE_HTML + #endif // _WX_HTMLFILT_H_