X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/806e2f154a201c4099c553130521a96bff7dfb0f..c267759c8f0d9d8954b2cc883c868b23ff1ca9ee:/samples/opengl/isosurf/isosurf.cpp

diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index e2e936b100..00ab92808d 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 <math.h>
+// The following part is taken largely unchanged from the original C Version
 
 GLboolean speed_test = GL_FALSE;
 GLboolean use_vertex_arrays = GL_FALSE;
@@ -250,15 +246,15 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     Args(argc, argv);
 
     // Create the main frame window
     frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"),
         wxDefaultPosition, wxDefaultSize);
 
-    // Give it an icon
-    frame->SetIcon(wxIcon(_T("mondrian")));
-
     // Make a menubar
     wxMenu *fileMenu = new wxMenu;
 
@@ -276,7 +272,7 @@ bool MyApp::OnInit()
     int gl_attrib[20] = { WX_GL_RGBA, WX_GL_MIN_RED, 1, WX_GL_MIN_GREEN, 1,
         WX_GL_MIN_BLUE, 1, WX_GL_DEPTH_SIZE, 1,
         WX_GL_DOUBLEBUFFER,
-#  ifdef __WXMAC__
+#  if defined(__WXMAC__) || defined(__WXCOCOA__)
         GL_NONE };
 #  else
         None };
@@ -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));
 }
 
 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();