ugh. Nesting the (per class) plugin sentries can require them to

[wxWidgets.git] / samples / opengl / isosurf / isosurf.cpp

diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 6ab145c64b7f291778891f686d625e2c906de348..fbb0a5e75219301d6533b8bdecdde3f9fd8ae360 100644 (file)
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -32,8 +32,24 @@
 #include "wx/timer.h"
 #include "wx/glcanvas.h"
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#ifdef __WXMAC__
+#  ifdef __DARWIN__
+#    include <OpenGL/gl.h>
+#    include <OpenGL/glu.h>
+#  else
+#    include <gl.h>
+#    include <glu.h>
+#  endif
+#else
+#  include <GL/gl.h>
+#  include <GL/glu.h>
+#endif
+
+// disabled because this has apparently changed in OpenGL 1.2, so doesn't link
+// correctly if this is on...
+#ifdef GL_EXT_vertex_array
+#undef GL_EXT_vertex_array
+#endif
 
 #include "isosurf.h"
 
@@ -187,13 +203,6 @@ static void Init(void)
 #endif
 }
 
-
-static void Reshape(int width, int height)
-{
-  glViewport(0, 0, (GLint)width, (GLint)height);
-}
-
-
 static GLenum Args(int argc, char **argv)
 {
    GLint i;
@@ -255,7 +264,12 @@ bool MyApp::OnInit(void)
 #else
   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, None };
+                       WX_GL_DOUBLEBUFFER,
+#  ifdef __WXMAC__
+                       GL_NONE };
+#  else
+                       None };
+#  endif
 #endif
 
   if(!doubleBuffer)
@@ -267,7 +281,7 @@ bool MyApp::OnInit(void)
       doubleBuffer = GL_FALSE;
   }
  
-  frame->m_canvas = new TestGLCanvas(frame, -1, wxPoint(0, 0), wxSize(200, 200),
+  frame->m_canvas = new TestGLCanvas(frame, -1, wxDefaultPosition, wxDefaultSize,
                                      0, "TestGLCanvas", gl_attrib );
 
   // Show the frame
@@ -348,14 +362,19 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event )
 
 void TestGLCanvas::OnSize(wxSizeEvent& event)
 {
+    // this is also necessary to update the context on some platforms
+    wxGLCanvas::OnSize(event);
+    
+    // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)
+               int w, h;
+               GetClientSize(&w, &h);
 #ifndef __WXMOTIF__
-    if (!GetContext()) return;
+    if (GetContext())
 #endif
-
+    {
     SetCurrent();
-    int width, height;
-    GetClientSize(& width, & height);
-    Reshape(width, height);
+        glViewport(0, 0, (GLint) w, (GLint) h);
+    }
 }
 
 void TestGLCanvas::OnChar(wxKeyEvent& event)