Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wx-prefixed macros throughout the repository.

Browse Source 
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:
Dimitri Schoolwerth
2015-04-23 15:49:01 +04:00
parent 2d3f617b34
commit 8f8d58d193
1697 changed files with 3543 additions and 3543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/html/chm.cpp
View File

@@ -909,7 +909,7 @@ wxString wxChmFSHandler::FindNext()
class wxChmSupportModule : public wxModule
{
DECLARE_DYNAMIC_CLASS(wxChmSupportModule)
wxDECLARE_DYNAMIC_CLASS(wxChmSupportModule);
public:
virtual bool OnInit()
@@ -921,6 +921,6 @@ public:
}
;
IMPLEMENT_DYNAMIC_CLASS(wxChmSupportModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxChmSupportModule, wxModule);
#endif // wxUSE_LIBMSPACK

2
src/html/helpctrl.cpp
View File

@@ -37,7 +37,7 @@
FORCE_LINK(wxhtml_chm_support)
#endif
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase);
wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow):
wxHelpControllerBase(parentWindow)

2
src/html/helpdata.cpp
View File

@@ -260,7 +260,7 @@ wxString wxHtmlHelpDataItem::GetIndentedName() const
}
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpData, wxObject);
wxHtmlHelpData::wxHtmlHelpData()
{

6
src/html/helpdlg.cpp
View File

@@ -36,11 +36,11 @@
#include "wx/html/helpctrl.h"
#include "wx/artprov.h"
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpDialog, wxDialog)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpDialog, wxDialog);
BEGIN_EVENT_TABLE(wxHtmlHelpDialog, wxDialog)
wxBEGIN_EVENT_TABLE(wxHtmlHelpDialog, wxDialog)
EVT_CLOSE(wxHtmlHelpDialog::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxHtmlHelpDialog::wxHtmlHelpDialog(wxWindow* parent, wxWindowID id, const wxString& title,
int style, wxHtmlHelpData* data)

6
src/html/helpfrm.cpp
View File

@@ -55,9 +55,9 @@
#include "wx/artprov.h"
#include "wx/spinctrl.h"
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame);
BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
wxBEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
EVT_ACTIVATE(wxHtmlHelpFrame::OnActivate)
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
#ifdef __WXMAC__
@@ -65,7 +65,7 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
EVT_MENU(wxID_HELP_CONTENTS, wxHtmlHelpFrame::OnAbout)
#endif
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
int style, wxHtmlHelpData* data

12
src/html/helpwnd.cpp
View File

@@ -202,9 +202,9 @@ void wxHtmlHelpWindow::UpdateMergedIndex()
// wxHtmlHelpWindow
//---------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpWindow, wxWindow)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpWindow, wxWindow);
BEGIN_EVENT_TABLE(wxHtmlHelpWindow, wxWindow)
wxBEGIN_EVENT_TABLE(wxHtmlHelpWindow, wxWindow)
EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, wxHtmlHelpWindow::OnToolbar)
EVT_BUTTON(wxID_HTML_BOOKMARKSREMOVE, wxHtmlHelpWindow::OnToolbar)
EVT_BUTTON(wxID_HTML_BOOKMARKSADD, wxHtmlHelpWindow::OnToolbar)
@@ -218,7 +218,7 @@ BEGIN_EVENT_TABLE(wxHtmlHelpWindow, wxWindow)
EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpWindow::OnIndexAll)
EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpWindow::OnBookmarksSel)
EVT_SIZE(wxHtmlHelpWindow::OnSize)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
wxHtmlHelpWindow::wxHtmlHelpWindow(wxWindow* parent, wxWindowID id,
const wxPoint& pos,
@@ -1283,14 +1283,14 @@ public:
UpdateTestWin();
}
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindowOptionsDialog);
};
BEGIN_EVENT_TABLE(wxHtmlHelpWindowOptionsDialog, wxDialog)
wxBEGIN_EVENT_TABLE(wxHtmlHelpWindowOptionsDialog, wxDialog)
EVT_COMBOBOX(wxID_ANY, wxHtmlHelpWindowOptionsDialog::OnUpdate)
EVT_SPINCTRL(wxID_ANY, wxHtmlHelpWindowOptionsDialog::OnUpdateSpin)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void wxHtmlHelpWindow::OptionsDialog()
{

12
src/html/htmlcell.cpp
View File

@@ -73,7 +73,7 @@ GetSelectedTextBgColour(const wxColour& WXUNUSED(clr))
// wxHtmlCell
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlCell, wxObject)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlCell, wxObject);
wxHtmlCell::wxHtmlCell() : wxObject()
{
@@ -291,7 +291,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
// wxHtmlWordCell
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell);
wxHtmlWordCell::wxHtmlWordCell(const wxString& word, const wxDC& dc) : wxHtmlCell()
{
@@ -639,7 +639,7 @@ wxString wxHtmlWordWithTabsCell::GetPartAsText(int begin, int end) const
// wxHtmlContainerCell
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlContainerCell, wxHtmlCell)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlContainerCell, wxHtmlCell);
wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCell()
{
@@ -1423,7 +1423,7 @@ void wxHtmlContainerCell::RemoveExtraSpacing(bool top, bool bottom)
// wxHtmlColourCell
// --------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlColourCell, wxHtmlCell)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlColourCell, wxHtmlCell);
void wxHtmlColourCell::Draw(wxDC& dc,
int x, int y,
@@ -1477,7 +1477,7 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
// wxHtmlFontCell
// ---------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlFontCell, wxHtmlCell)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlFontCell, wxHtmlCell);
void wxHtmlFontCell::Draw(wxDC& dc,
int WXUNUSED(x), int WXUNUSED(y),
@@ -1504,7 +1504,7 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),
// wxHtmlWidgetCell
// ---------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlWidgetCell, wxHtmlCell)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWidgetCell, wxHtmlCell);
wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
{

12
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -34,13 +34,13 @@ extern WXDLLEXPORT_DATA(const char) wxWebKitCtrlNameStr[] = "webkitctrl";
// macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl)
wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl);
BEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
wxBEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
#if defined(__WXMAC__) && wxOSX_USE_CARBON
EVT_SIZE(wxWebKitCtrl::OnSize)
#endif
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
#if defined(__WXOSX__) && wxOSX_USE_CARBON
@@ -280,7 +280,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebKitCtrlEventHandler )
// wxWebKit Events
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS( wxWebKitStateChangedEvent, wxCommandEvent )
wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitStateChangedEvent, wxCommandEvent);
wxDEFINE_EVENT( wxEVT_WEBKIT_STATE_CHANGED, wxWebKitStateChangedEvent );
@@ -294,7 +294,7 @@ wxWebKitStateChangedEvent::wxWebKitStateChangedEvent( wxWindow* win )
}
}
IMPLEMENT_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent, wxCommandEvent )
wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitBeforeLoadEvent, wxCommandEvent);
wxDEFINE_EVENT( wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBeforeLoadEvent );
@@ -310,7 +310,7 @@ wxWebKitBeforeLoadEvent::wxWebKitBeforeLoadEvent( wxWindow* win )
}
IMPLEMENT_DYNAMIC_CLASS( wxWebKitNewWindowEvent, wxCommandEvent )
wxIMPLEMENT_DYNAMIC_CLASS(wxWebKitNewWindowEvent, wxCommandEvent);
wxDEFINE_EVENT( wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent );

14
src/html/htmlfilt.cpp
View File

@@ -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

6
src/html/htmlpars.cpp
View File

@@ -73,7 +73,7 @@ public:
// wxHtmlParser
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlParser,wxObject)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlParser,wxObject);
wxHtmlParser::wxHtmlParser()
: wxObject(),
@@ -412,7 +412,7 @@ wxString wxHtmlParser::GetInnerSource(const wxHtmlTag& tag)
// wxHtmlTagHandler
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlTagHandler,wxObject)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlTagHandler, wxObject);
void wxHtmlTagHandler::ParseInnerSource(const wxString& source)
{
@@ -428,7 +428,7 @@ void wxHtmlTagHandler::ParseInnerSource(const wxString& source)
// wxHtmlEntitiesParser
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxHtmlEntitiesParser,wxObject)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlEntitiesParser, wxObject);
wxHtmlEntitiesParser::wxHtmlEntitiesParser()
#if !wxUSE_UNICODE

16
src/html/htmlwin.cpp
View File

@@ -39,8 +39,8 @@
//#define DEBUG_HTML_SELECTION
// HTML events:
IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent);
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent);
wxDEFINE_EVENT( wxEVT_HTML_CELL_CLICKED, wxHtmlCellEvent );
wxDEFINE_EVENT( wxEVT_HTML_CELL_HOVER, wxHtmlCellEvent );
@@ -1683,7 +1683,7 @@ void wxHtmlWindow::SelectAll()
IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor, wxObject);
wxBEGIN_PROPERTIES_TABLE(wxHtmlWindow)
/*
@@ -1700,9 +1700,9 @@ wxEND_HANDLERS_TABLE()
wxCONSTRUCTOR_5( wxHtmlWindow , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow,"wx/html/htmlwin.h")
wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxHtmlWindow, wxScrolledWindow, "wx/html/htmlwin.h");
BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
wxBEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
EVT_SIZE(wxHtmlWindow::OnSize)
EVT_LEFT_DOWN(wxHtmlWindow::OnMouseDown)
EVT_LEFT_UP(wxHtmlWindow::OnMouseUp)
@@ -1719,7 +1719,7 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy)
EVT_TEXT_COPY(wxID_ANY, wxHtmlWindow::OnClipboardEvent)
#endif // wxUSE_CLIPBOARD
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
//-----------------------------------------------------------------------------
// wxHtmlWindowInterface implementation in wxHtmlWindow
@@ -1847,14 +1847,14 @@ void wxHtmlWindow::SetDefaultHTMLCursor(HTMLCursor type, const wxCursor& cursor)
class wxHtmlWinModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
wxDECLARE_DYNAMIC_CLASS(wxHtmlWinModule);
public:
wxHtmlWinModule() : wxModule() {}
bool OnInit() wxOVERRIDE { return true; }
void OnExit() wxOVERRIDE { wxHtmlWindow::CleanUpStatics(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule);
// This hack forces the linker to always link in m_* files

4
src/html/htmprint.cpp
View File

@@ -832,14 +832,14 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
class wxHtmlPrintingModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule)
wxDECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule);
public:
wxHtmlPrintingModule() : wxModule() {}
bool OnInit() wxOVERRIDE { return true; }
void OnExit() wxOVERRIDE { wxHtmlPrintout::CleanUpStatics(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule);
// This hack forces the linker to always link in m_* files

6
src/html/winpars.cpp
View File

@@ -33,7 +33,7 @@
// wxHtmlWinParser
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser);
wxList wxHtmlWinParser::m_Modules;
@@ -742,7 +742,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
// wxHtmlWinTagHandler
//-----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler)
wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler);
void wxHtmlWinTagHandler::ApplyStyle(const wxHtmlStyleParams &styleParams)
{
@@ -861,7 +861,7 @@ void wxHtmlWinTagHandler::ApplyStyle(const wxHtmlStyleParams &styleParams)
// Do not add any winpars.cpp shutdown or initialization code to it,
// create a new module instead!
IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule)
wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule);
bool wxHtmlTagsModule::OnInit()
{