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

12
samples/dragimag/dragimag.cpp
View File

@@ -48,11 +48,11 @@ IMPLEMENT_APP(MyApp)
IMPLEMENT_CLASS(MyCanvas, wxScrolledWindow)
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
wxBEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_PAINT(MyCanvas::OnPaint)
EVT_ERASE_BACKGROUND(MyCanvas::OnEraseBackground)
EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size )
@@ -307,10 +307,10 @@ DragShape* MyCanvas::FindShape(const wxPoint& pt) const
// MyFrame
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
BEGIN_EVENT_TABLE(MyFrame,wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame,wxFrame)
EVT_MENU (wxID_ABOUT, MyFrame::OnAbout)
EVT_MENU (wxID_EXIT, MyFrame::OnQuit)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyFrame::MyFrame()
: wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxDragImage sample"),
@@ -353,9 +353,9 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
// MyApp
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyApp, wxApp)
wxBEGIN_EVENT_TABLE(MyApp, wxApp)
EVT_MENU(TEST_USE_SCREEN, MyApp::OnUseScreen)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyApp::MyApp()
{

8
samples/dragimag/dragimag.h
View File

@@ -34,8 +34,8 @@ public:
private:
MyCanvas* m_canvas;
DECLARE_DYNAMIC_CLASS(MyFrame)
DECLARE_EVENT_TABLE()
wxDECLARE_DYNAMIC_CLASS(MyFrame);
wxDECLARE_EVENT_TABLE();
};
// MyApp
@@ -105,8 +105,8 @@ private:
wxPoint m_dragStartPos;
wxDragImage* m_dragImage;
DECLARE_CLASS(MyCanvas)
DECLARE_EVENT_TABLE()
wxDECLARE_ABSTRACT_CLASS(MyCanvas);
wxDECLARE_EVENT_TABLE();
};