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

10
samples/treectrl/treetest.cpp
View File

@@ -71,7 +71,7 @@ static const int NUM_LEVELS = 2;
#define MENU_LINK(name) EVT_MENU(TreeTest_##name, MyFrame::On##name)
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_IDLE(MyFrame::OnIdle)
EVT_SIZE(MyFrame::OnSize)
@@ -147,12 +147,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
MENU_LINK(SelectLast)
#undef MENU_LINK
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
#if USE_GENERIC_TREECTRL
BEGIN_EVENT_TABLE(MyTreeCtrl, wxGenericTreeCtrl)
wxBEGIN_EVENT_TABLE(MyTreeCtrl, wxGenericTreeCtrl)
#else
BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
wxBEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
#endif
EVT_TREE_BEGIN_DRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginDrag)
EVT_TREE_BEGIN_RDRAG(TreeTest_Ctrl, MyTreeCtrl::OnBeginRDrag)
@@ -186,7 +186,7 @@ BEGIN_EVENT_TABLE(MyTreeCtrl, wxTreeCtrl)
EVT_RIGHT_DOWN(MyTreeCtrl::OnRMouseDown)
EVT_RIGHT_UP(MyTreeCtrl::OnRMouseUp)
EVT_RIGHT_DCLICK(MyTreeCtrl::OnRMouseDClick)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
IMPLEMENT_APP(MyApp)

8
samples/treectrl/treetest.h
View File

@@ -155,12 +155,12 @@ private:
bool m_alternateImages;
bool m_alternateStates;
// NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
// NB: due to an ugly wxMSW hack you _must_ use wxDECLARE_DYNAMIC_CLASS();
// if you want your overloaded OnCompareItems() to be called.
// OTOH, if you don't want it you may omit the next line - this will
// make default (alphabetical) sorting much faster under wxMSW.
DECLARE_DYNAMIC_CLASS(MyTreeCtrl)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(MyTreeCtrl);
wxDECLARE_EVENT_TABLE();
};
// Define a new frame type
@@ -302,7 +302,7 @@ private:
void DoSetBold(bool bold = true);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// menu and control ids