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:
@@ -58,18 +58,18 @@
|
||||
// the event tables connect the wxWidgets events with the functions (event
|
||||
// handlers) which process them. It can be also done at run-time, but for the
|
||||
// simple menu events like this the static method is much simpler.
|
||||
BEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
|
||||
wxBEGIN_EVENT_TABLE(wxEmulatorFrame, wxFrame)
|
||||
EVT_MENU(Emulator_Quit, wxEmulatorFrame::OnQuit)
|
||||
EVT_MENU(Emulator_About, wxEmulatorFrame::OnAbout)
|
||||
EVT_CLOSE(wxEmulatorFrame::OnCloseWindow)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
// Create a new application object: this macro will allow wxWidgets to create
|
||||
// the application object during program execution (it's better than using a
|
||||
// static object for many reasons) and also declares the accessor function
|
||||
// wxGetApp() which will return the reference of the right type (i.e. wxEmulatorApp and
|
||||
// not wxApp)
|
||||
IMPLEMENT_APP(wxEmulatorApp)
|
||||
wxIMPLEMENT_APP(wxEmulatorApp);
|
||||
|
||||
static const wxCmdLineEntryDesc sg_cmdLineDesc[] =
|
||||
{
|
||||
@@ -325,13 +325,13 @@ void wxEmulatorFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
|
||||
}
|
||||
}
|
||||
|
||||
IMPLEMENT_CLASS(wxEmulatorContainer, wxWindow)
|
||||
wxIMPLEMENT_CLASS(wxEmulatorContainer, wxWindow);
|
||||
|
||||
BEGIN_EVENT_TABLE(wxEmulatorContainer, wxWindow)
|
||||
wxBEGIN_EVENT_TABLE(wxEmulatorContainer, wxWindow)
|
||||
EVT_SIZE(wxEmulatorContainer::OnSize)
|
||||
EVT_PAINT(wxEmulatorContainer::OnPaint)
|
||||
EVT_ERASE_BACKGROUND(wxEmulatorContainer::OnEraseBackground)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
wxEmulatorContainer::wxEmulatorContainer(wxWindow* parent, wxWindowID id):
|
||||
wxWindow(parent, id, wxDefaultPosition, wxDefaultSize)
|
||||
|
@@ -108,8 +108,8 @@ public:
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
void OnEraseBackground(wxEraseEvent& event);
|
||||
|
||||
DECLARE_CLASS(wxEmulatorContainer)
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_CLASS(wxEmulatorContainer);
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
|
||||
};
|
||||
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
|
||||
private:
|
||||
// any class wishing to process wxWidgets events must use this macro
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user