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/opengl/cube/cube.cpp
View File

@@ -306,11 +306,11 @@ TestGLContext& MyApp::GetContext(wxGLCanvas *canvas, bool useStereo)
// TestGLCanvas
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
wxBEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
EVT_PAINT(TestGLCanvas::OnPaint)
EVT_KEY_DOWN(TestGLCanvas::OnKeyDown)
EVT_TIMER(SpinTimer, TestGLCanvas::OnSpinTimer)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
TestGLCanvas::TestGLCanvas(wxWindow *parent, int *attribList)
// With perspective OpenGL graphics, the wxFULL_REPAINT_ON_RESIZE style
@@ -452,11 +452,11 @@ wxString glGetwxString(GLenum name)
// MyFrame: main application window
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_NEW, MyFrame::OnNewWindow)
EVT_MENU(NEW_STEREO_WINDOW, MyFrame::OnNewStereoWindow)
EVT_MENU(wxID_CLOSE, MyFrame::OnClose)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyFrame::MyFrame( bool stereoWindow )
: wxFrame(NULL, wxID_ANY, wxT("wxWidgets OpenGL Cube Sample"))

4
samples/opengl/cube/cube.h
View File

@@ -59,7 +59,7 @@ private:
void OnNewWindow(wxCommandEvent& event);
void OnNewStereoWindow(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
class TestGLCanvas : public wxGLCanvas
@@ -81,7 +81,7 @@ private:
bool m_useStereo,
m_stereoWarningAlreadyDisplayed;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
enum

8
samples/opengl/isosurf/isosurf.cpp
View File

@@ -87,9 +87,9 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser)
// MyFrame
//---------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_EXIT, MyFrame::OnExit)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
const wxSize& size, long style)
@@ -161,12 +161,12 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
// TestGLCanvas
//---------------------------------------------------------------------------
BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
wxBEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
EVT_SIZE(TestGLCanvas::OnSize)
EVT_PAINT(TestGLCanvas::OnPaint)
EVT_CHAR(TestGLCanvas::OnChar)
EVT_MOUSE_EVENTS(TestGLCanvas::OnMouseEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
TestGLCanvas::TestGLCanvas(wxWindow *parent,
wxWindowID id,

4
samples/opengl/isosurf/isosurf.h
View File

@@ -70,7 +70,7 @@ private:
GLfloat m_yrot;
wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
@@ -91,7 +91,7 @@ public:
private :
void OnExit(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};

8
samples/opengl/penguin/penguin.cpp
View File

@@ -66,11 +66,11 @@ IMPLEMENT_APP(MyApp)
// MyFrame
// ---------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_OPEN, MyFrame::OnMenuFileOpen)
EVT_MENU(wxID_EXIT, MyFrame::OnMenuFileExit)
EVT_MENU(wxID_HELP, MyFrame::OnMenuHelpAbout)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
// MyFrame constructor
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
@@ -133,12 +133,12 @@ void MyFrame::OnMenuHelpAbout( wxCommandEvent& WXUNUSED(event) )
// TestGLCanvas
// ---------------------------------------------------------------------------
BEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
wxBEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
EVT_SIZE(TestGLCanvas::OnSize)
EVT_PAINT(TestGLCanvas::OnPaint)
EVT_ERASE_BACKGROUND(TestGLCanvas::OnEraseBackground)
EVT_MOUSE_EVENTS(TestGLCanvas::OnMouse)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
TestGLCanvas::TestGLCanvas(wxWindow *parent,
wxWindowID id,

4
samples/opengl/penguin/penguin.h
View File

@@ -69,7 +69,7 @@ public:
private:
TestGLCanvas *m_canvas;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
@@ -100,7 +100,7 @@ private:
DXFRenderer m_renderer;
wxDECLARE_NO_COPY_CLASS(TestGLCanvas);
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif // #ifndef _WX_PENGUIN_H_