Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
@@ -39,14 +39,14 @@ There is code for several default filters:
|
||||
|
||||
*/
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject)
|
||||
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject);
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
// wxHtmlFilterPlainText
|
||||
// filter for text/plain or uknown
|
||||
//--------------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter);
|
||||
|
||||
bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
|
||||
{
|
||||
@@ -81,14 +81,14 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
|
||||
|
||||
class wxHtmlFilterImage : public wxHtmlFilter
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterImage);
|
||||
|
||||
public:
|
||||
virtual bool CanRead(const wxFSFile& file) const wxOVERRIDE;
|
||||
virtual wxString ReadFile(const wxFSFile& file) const wxOVERRIDE;
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter);
|
||||
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const
|
||||
//--------------------------------------------------------------------------------
|
||||
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter);
|
||||
|
||||
bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const
|
||||
{
|
||||
@@ -188,7 +188,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
|
||||
|
||||
class wxHtmlFilterModule : public wxModule
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxHtmlFilterModule)
|
||||
wxDECLARE_DYNAMIC_CLASS(wxHtmlFilterModule);
|
||||
|
||||
public:
|
||||
virtual bool OnInit() wxOVERRIDE
|
||||
@@ -200,6 +200,6 @@ class wxHtmlFilterModule : public wxModule
|
||||
virtual void OnExit() wxOVERRIDE {}
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user