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

use "new" wx-prefixed macros in samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 07:07:55 +00:00
parent 08a02f640a
commit 5b4a70247c
162 changed files with 698 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/taskbar/tbtest.cpp
View File

@@ -82,12 +82,12 @@ bool MyApp::OnInit()
// MyDialog implementation
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyDialog, wxDialog)
wxBEGIN_EVENT_TABLE(MyDialog, wxDialog)
EVT_BUTTON(wxID_ABOUT, MyDialog::OnAbout)
EVT_BUTTON(wxID_OK, MyDialog::OnOK)
EVT_BUTTON(wxID_EXIT, MyDialog::OnExit)
EVT_CLOSE(MyDialog::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyDialog::MyDialog(const wxString& title)
@@ -201,7 +201,7 @@ enum
};
BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
wxBEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
EVT_MENU(PU_RESTORE, MyTaskBarIcon::OnMenuRestore)
EVT_MENU(PU_EXIT, MyTaskBarIcon::OnMenuExit)
EVT_MENU(PU_NEW_ICON,MyTaskBarIcon::OnMenuSetNewIcon)
@@ -210,7 +210,7 @@ BEGIN_EVENT_TABLE(MyTaskBarIcon, wxTaskBarIcon)
EVT_TASKBAR_LEFT_DCLICK (MyTaskBarIcon::OnLeftButtonDClick)
EVT_MENU(PU_SUB1, MyTaskBarIcon::OnMenuSub)
EVT_MENU(PU_SUB2, MyTaskBarIcon::OnMenuSub)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
void MyTaskBarIcon::OnMenuRestore(wxCommandEvent& )
{

4
samples/taskbar/tbtest.h
View File

@@ -28,7 +28,7 @@ public:
void OnMenuSub(wxCommandEvent&);
virtual wxMenu *CreatePopupMenu() wxOVERRIDE;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
@@ -56,5 +56,5 @@ protected:
MyTaskBarIcon *m_dockIcon;
#endif
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};