X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f50a1c3d667fb948bfbdcbd4b3021d896c6635cd..9920ad328b7bb97ad927b9524cbe6e1b785be742:/samples/opengl/isosurf/isosurf.cpp diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp index 2cc7b686dd..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" @@ -54,6 +49,8 @@ #include "isosurf.h" +#include "../../sample.xpm" + // The following part is taken largely unchanged from the original C Version GLboolean speed_test = GL_FALSE; @@ -77,7 +74,7 @@ static GLfloat yrot; static void read_surface( const wxChar *filename ) { - FILE *f = wxFopen(wxFNCONV(filename),_T("r")); + FILE *f = wxFopen(filename,_T("r")); if (!f) { wxString msg = _T("Couldn't read "); @@ -315,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() @@ -344,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();