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

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();