indentation fixes; virtual dtor for all platforms, not only MacOS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
#define _WX_HTMLFILT_H_
|
#define _WX_HTMLFILT_H_
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma interface
|
#pragma interface "htmlfilt.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
@@ -34,18 +34,16 @@ class WXDLLEXPORT wxHtmlFilter : public wxObject
|
|||||||
{
|
{
|
||||||
DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
|
DECLARE_ABSTRACT_CLASS(wxHtmlFilter)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
wxHtmlFilter() : wxObject() {}
|
wxHtmlFilter() : wxObject() {}
|
||||||
#ifdef __WXMAC_X__
|
|
||||||
virtual ~wxHtmlFilter() {}
|
virtual ~wxHtmlFilter() {}
|
||||||
#endif
|
|
||||||
|
|
||||||
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.
|
||||||
// reads given file and returns HTML document.
|
|
||||||
// Returns empty string if opening failed
|
// 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)
|
DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual bool CanRead(const wxFSFile& file) const;
|
virtual bool CanRead(const wxFSFile& file) const;
|
||||||
virtual wxString ReadFile(const wxFSFile& file) const;
|
virtual wxString ReadFile(const wxFSFile& file) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif // wxUSE_HTML
|
||||||
|
|
||||||
#endif // _WX_HTMLFILT_H_
|
#endif // _WX_HTMLFILT_H_
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user