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

update the samples to use new (non-deprecated) wxGLCanvas API; added more comments; some cleanup (modified patch 1882679)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-10 13:26:01 +00:00
parent 845035287a
commit 451c13c85c
7 changed files with 247 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,54 +13,58 @@
#define _WX_ISOSURF_H_
// Define a new application type
class MyApp: public wxApp
class MyApp : public wxApp
{
public:
bool OnInit();
virtual bool OnInit();
};
#if wxUSE_GLCANVAS
class TestGLCanvas: public wxGLCanvas
class TestGLCanvas : public wxGLCanvas
{
public:
TestGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = _T("TestGLCanvas"), int *gl_attrib = NULL);
TestGLCanvas(wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = _T("TestGLCanvas"),
int *gl_attrib = NULL);
~TestGLCanvas(){};
virtual ~TestGLCanvas();
void OnPaint(wxPaintEvent& event);
void OnSize(wxSizeEvent& event);
void OnEraseBackground(wxEraseEvent& event);
void OnChar(wxKeyEvent& event);
void OnMouseEvent(wxMouseEvent& event);
private:
wxGLContext* m_glRC;
DECLARE_NO_COPY_CLASS(TestGLCanvas)
DECLARE_EVENT_TABLE()
};
class MyFrame : public wxFrame
{
public:
MyFrame(wxFrame *frame,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
long style = wxDEFAULT_FRAME_STYLE);
virtual ~MyFrame();
TestGLCanvas *m_canvas;
private :
void OnExit(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
};
#endif // #if wxUSE_GLCANVAS
class MyFrame: public wxFrame
{
public:
MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
const wxSize& size, long style = wxDEFAULT_FRAME_STYLE);
virtual ~MyFrame();
#if wxUSE_GLCANVAS
TestGLCanvas *m_canvas;
#endif
private :
void OnExit(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
};
#endif // #ifndef _WX_ISOSURF_H_
#endif // _WX_ISOSURF_H_