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

16
samples/mdi/mdi.cpp
View File

@@ -62,7 +62,7 @@ IMPLEMENT_APP(MyApp)
// event tables
// ---------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
EVT_MENU(wxID_NEW, MyFrame::OnNewWindow)
EVT_MENU(MDI_FULLSCREEN, MyFrame::OnFullScreen)
@@ -71,12 +71,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
EVT_MENU(wxID_CLOSE_ALL, MyFrame::OnCloseAll)
EVT_CLOSE(MyFrame::OnClose)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// Note that wxID_NEW and wxID_ABOUT commands get passed
// to the parent window for processing, so no need to
// duplicate event handlers here.
BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
wxBEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
EVT_MENU(wxID_CLOSE, MyChild::OnClose)
EVT_MENU(MDI_REFRESH, MyChild::OnRefresh)
EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle)
@@ -92,15 +92,15 @@ BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
EVT_MOVE(MyChild::OnMove)
EVT_CLOSE(MyChild::OnCloseWindow)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
BEGIN_EVENT_TABLE(MyChild::EventHandler, wxEvtHandler)
wxBEGIN_EVENT_TABLE(MyChild::EventHandler, wxEvtHandler)
EVT_MENU(MDI_REFRESH, MyChild::EventHandler::OnRefresh)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// ===========================================================================
// implementation

8
samples/mdi/mdi.h
View File

@@ -34,7 +34,7 @@ private:
bool m_dirty;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// Define a new frame
@@ -60,7 +60,7 @@ private:
wxTextCtrl *m_textWindow;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
class MyChild : public wxMDIChildFrame
@@ -108,12 +108,12 @@ private:
const unsigned m_numChild;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
wxDECLARE_NO_COPY_CLASS(EventHandler);
};
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// menu items ids