X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/806e2f154a201c4099c553130521a96bff7dfb0f..9920ad328b7bb97ad927b9524cbe6e1b785be742:/samples/opengl/isosurf/isosurf.cpp diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp index e2e936b100..8e5aec6357 100644 --- a/samples/opengl/isosurf/isosurf.cpp +++ b/samples/opengl/isosurf/isosurf.cpp @@ -9,11 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#pragma interface -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -31,6 +26,7 @@ #include "wx/timer.h" #include "wx/glcanvas.h" +#include "wx/math.h" #if defined(__WXMAC__) || defined(__WXCOCOA__) # ifdef __DARWIN__ @@ -53,9 +49,9 @@ #include "isosurf.h" -// The following part is taken largely unchanged from the original C Version +#include "../../sample.xpm" -#include +// The following part is taken largely unchanged from the original C Version GLboolean speed_test = GL_FALSE; GLboolean use_vertex_arrays = GL_FALSE; @@ -316,6 +312,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, : wxFrame(frame, wxID_ANY, title, pos, size, style) { m_canvas = NULL; + SetIcon(wxIcon(sample_xpm)); } MyFrame::~MyFrame() @@ -345,7 +342,7 @@ END_EVENT_TABLE() TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, int* gl_attrib) - : wxGLCanvas(parent, id, pos, size, style, name, gl_attrib) + : wxGLCanvas(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE, name, gl_attrib) { parent->Show(true); SetCurrent();