Fixed Open Watcom compilation of OpenGL samples; Code cleanup.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2003-11-15 04:21:10 +00:00
parent 9c157f38e3
commit 5cf036d017
7 changed files with 601 additions and 518 deletions

View File

@@ -14,43 +14,53 @@
// Define a new application type
class MyApp: public wxApp
{ public:
bool OnInit(void);
{
public:
bool OnInit();
};
#if wxUSE_GLCANVAS
class TestGLCanvas: public wxGLCanvas
{
public:
TestGLCanvas(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = _T("TestGLCanvas"),
int* gl_attrib = NULL);
~TestGLCanvas(void);
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);
void OnPaint(wxPaintEvent& event);
void OnSize(wxSizeEvent& event);
void OnEraseBackground(wxEraseEvent& event);
void OnChar(wxKeyEvent& event);
void OnMouseEvent(wxMouseEvent& event);
~TestGLCanvas();
DECLARE_EVENT_TABLE()
void OnPaint(wxPaintEvent& event);
void OnSize(wxSizeEvent& event);
void OnEraseBackground(wxEraseEvent& event);
void OnChar(wxKeyEvent& event);
void OnMouseEvent(wxMouseEvent& event);
DECLARE_EVENT_TABLE()
};
#endif
#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);
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);
public:
#if wxUSE_GLCANVAS
TestGLCanvas* m_canvas;
#endif
DECLARE_EVENT_TABLE()
};
#endif
#endif // #ifndef _WX_ISOSURF_H_