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

12
utils/emulator/src/emulator.cpp
View File

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

6
utils/emulator/src/emulator.h
View File

@@ -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();
};
// ----------------------------------------------------------------------------

38
utils/helpview/src/client.cpp
View File

@@ -55,25 +55,25 @@
// wxWin macros
// ----------------------------------------------------------------------------
IMPLEMENT_APP(MyApp)
wxIMPLEMENT_APP(MyApp);
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(CLIENT_QUIT, MyFrame::OnExit)
EVT_MENU(CLIENT_HELPMAIN, MyFrame::OnHelp_Main)
EVT_MENU(CLIENT_HELPBOOK1, MyFrame::OnHelp_Book1)
EVT_MENU(CLIENT_HELPBOOK2, MyFrame::OnHelp_Book2)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(CLIENT_QUIT, MyFrame::OnExit)
EVT_MENU(CLIENT_HELPMAIN, MyFrame::OnHelp_Main)
EVT_MENU(CLIENT_HELPBOOK1, MyFrame::OnHelp_Book1)
EVT_MENU(CLIENT_HELPBOOK2, MyFrame::OnHelp_Book2)
EVT_MENU(CLIENT_HELPINDEX, MyFrame::OnHelp_Index)
EVT_MENU(CLIENT_HELPCONTENTS, MyFrame::OnHelp_Contents)
EVT_MENU(CLIENT_HELPSEARCH, MyFrame::OnHelp_Search)
EVT_MENU(CLIENT_HELPTITLE, MyFrame::OnHelp_Title)
EVT_MENU(CLIENT_HELPADDBOOK, MyFrame::OnHelp_Addbook)
EVT_MENU(CLIENT_HELPTEMPDIR, MyFrame::OnHelp_Tempdir)
EVT_MENU(CLIENT_HELPQUIT, MyFrame::OnHelp_Quitserver)
EVT_MENU(CLIENT_HELPINDEX, MyFrame::OnHelp_Index)
EVT_MENU(CLIENT_HELPCONTENTS, MyFrame::OnHelp_Contents)
EVT_MENU(CLIENT_HELPSEARCH, MyFrame::OnHelp_Search)
EVT_MENU(CLIENT_HELPTITLE, MyFrame::OnHelp_Title)
EVT_MENU(CLIENT_HELPADDBOOK, MyFrame::OnHelp_Addbook)
EVT_MENU(CLIENT_HELPTEMPDIR, MyFrame::OnHelp_Tempdir)
EVT_MENU(CLIENT_HELPQUIT, MyFrame::OnHelp_Quitserver)
EVT_MENU(DIALOG_MODAL, MyFrame::ModalDlg)
EVT_BUTTON(BUTTON_MODAL, MyFrame::ModalDlg)
END_EVENT_TABLE()
EVT_MENU(DIALOG_MODAL, MyFrame::ModalDlg)
EVT_BUTTON(BUTTON_MODAL, MyFrame::ModalDlg)
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// globals
@@ -245,9 +245,9 @@ void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event))
dlg.ShowModal();
}
BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
EVT_BUTTON(wxID_ANY, MyModalDialog::OnButton)
END_EVENT_TABLE()
wxBEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
EVT_BUTTON(wxID_ANY, MyModalDialog::OnButton)
wxEND_EVENT_TABLE()
// ----------------------------------------------------------------------------
// MyModalDialog

6
utils/helpview/src/client.h
View File

@@ -22,7 +22,7 @@ public:
#endif
};
DECLARE_APP(MyApp)
wxDECLARE_APP(MyApp);
// Define a new frame
class MyFrame: public wxFrame
@@ -48,7 +48,7 @@ private:
wxPanel *m_panel;
wxButton *m_modalbutton;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
class MyModalDialog : public wxDialog
@@ -63,7 +63,7 @@ private:
wxButton *m_book1;
wxButton *m_book2;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};

2
utils/helpview/src/helpview.cpp
View File

@@ -39,7 +39,7 @@ protected:
const wxSize& size);
};
IMPLEMENT_APP(hvApp)
wxIMPLEMENT_APP(hvApp);
hvApp::hvApp()
{

2
utils/helpview/src/remhelp.cpp
View File

@@ -84,7 +84,7 @@ bool rhhcConnection::OnDisconnect()
// wxRemoteHtmlHelpController class
IMPLEMENT_CLASS(wxRemoteHtmlHelpController, wxHelpControllerBase)
wxIMPLEMENT_CLASS(wxRemoteHtmlHelpController, wxHelpControllerBase);
wxRemoteHtmlHelpController::wxRemoteHtmlHelpController(int style )
{

2
utils/helpview/src/remhelp.h
View File

@@ -40,7 +40,7 @@ public:
class wxRemoteHtmlHelpController : public wxHelpControllerBase
{
DECLARE_CLASS(wxRemoteHtmlHelpController)
wxDECLARE_CLASS(wxRemoteHtmlHelpController);
public:
wxRemoteHtmlHelpController(int style = wxHF_DEFAULT_STYLE);
virtual ~wxRemoteHtmlHelpController();

2
utils/hhp2cached/hhp2cached.cpp
View File

@@ -26,7 +26,7 @@ public:
virtual bool OnInit();
};
IMPLEMENT_APP(MyApp);
wxIMPLEMENT_APP(MyApp);
bool MyApp::OnInit()
{

2
utils/ifacecheck/src/ifacecheck.cpp
View File

@@ -117,7 +117,7 @@ protected:
wxString m_strToMatch;
};
IMPLEMENT_APP_CONSOLE(IfaceCheckApp)
wxIMPLEMENT_APP_CONSOLE(IfaceCheckApp);
int IfaceCheckApp::OnRun()
{

8
utils/screenshotgen/src/customcombo.cpp
View File

@@ -24,21 +24,21 @@
#include "customcombo.h"
BEGIN_EVENT_TABLE(ListViewComboPopup, wxListView)
wxBEGIN_EVENT_TABLE(ListViewComboPopup, wxListView)
EVT_MOTION(ListViewComboPopup::OnMouseMove)
// NOTE: Left down event is used instead of left up right now
// since MSW wxListCtrl doesn't seem to emit left ups
// consistently.
EVT_LEFT_DOWN(ListViewComboPopup::OnMouseClick)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BEGIN_EVENT_TABLE(TreeCtrlComboPopup, wxTreeCtrl)
wxBEGIN_EVENT_TABLE(TreeCtrlComboPopup, wxTreeCtrl)
EVT_MOTION(TreeCtrlComboPopup::OnMouseMove)
// NOTE: Left down event is used instead of left up right now
// since MSW wxTreeCtrl doesn't seem to emit left ups
// consistently.
EVT_LEFT_DOWN(TreeCtrlComboPopup::OnMouseClick)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()

4
utils/screenshotgen/src/customcombo.h
View File

@@ -117,7 +117,7 @@ protected:
int m_itemHere; // hot item in popup
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
@@ -241,7 +241,7 @@ protected:
wxTreeItemId m_itemHere; // hot item in popup
private:
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};

2
utils/screenshotgen/src/screenshot_app.cpp
View File

@@ -27,7 +27,7 @@
// ScreenshotApp
// ----------------------------------------------------------------------------
IMPLEMENT_APP(ScreenshotApp);
wxIMPLEMENT_APP(ScreenshotApp);
bool ScreenshotApp::OnInit()
{

2
utils/wxrc/wxrc.cpp
View File

@@ -254,7 +254,7 @@ private:
void GenCPPHeader();
};
IMPLEMENT_APP_CONSOLE(XmlResApp)
wxIMPLEMENT_APP_CONSOLE(XmlResApp);
int XmlResApp::OnRun()
{