corrections for Mac OS X compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/opengl/isosurf/isosurf.cpp

@@ -32,8 +32,18 @@
 #include "wx/timer.h"
 #include "wx/glcanvas.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
 
 #include "isosurf.h"
 
@@ -255,7 +265,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)

samples/opengl/penguin/lw.cpp

@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <math.h>
 
-#ifndef __WXMAC__
-// does this not give redefine errors on other platforms ?
+#if !defined(__WXMAC__) || defined(__DARWIN__)
+// these must be defined in the precompiled headers under CodeWarrior
 #define wxInt32 int
 #define wxUint32 unsigned int
 #endif

samples/opengl/penguin/lw.h

@@ -21,7 +21,11 @@
 #define LW_H
 
 #ifdef __WXMAC__
+#  ifdef __DARWIN__
+#    include <OpenGL/glu.h>
+#  else
 #    include <glu.h>
+#  endif
 #else
 #  include <GL/glu.h>
 #endif

samples/opengl/penguin/penguin.cpp

@@ -31,7 +31,11 @@
 
 #include "penguin.h"
 #ifdef __WXMAC__
+#  ifdef __DARWIN__
+#    include <OpenGL/glu.h>
+#  else
 #    include <glu.h>
+#  endif
 #else
 #  include <GL/glu.h>
 #endif