nvizlib: Mac-related fixes (thanks to William Kyngesburye)

(merge from devbr6, https://trac.osgeo.org/grass/changeset/33321)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33323 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/nviz/nviz.h

@@ -5,9 +5,9 @@
 
 extern "C" {
 #include <grass/gis.h>
+#include <grass/nviz.h>
 #include <grass/gsurf.h>
 #include <grass/gstypes.h>
-#include <grass/nviz.h>
 }
 
 // For compilers that support precompilation, includes "wx.h".

gui/wxpython/nviz/nviz.i

@@ -2,9 +2,9 @@
 
 %module grass7_wxnviz
 %{
+#include "nviz.h"
 #include <grass/gsurf.h>
 #include <grass/gstypes.h>
-#include "nviz.h"
 %}
 
 %include "std_vector.i"

include/nviz.h

@@ -128,9 +128,9 @@ struct render_window
     GLXPixmap windowId;
     Pixmap pixmap;
 #elif defined(OPENGL_AQUA)
-    AGLPixelFmtID pixelFmtId;
+    AGLPixelFormat pixelFmtId;
     AGLContext contextId;
-    AGLPixmap windowId;
+    AGLPbuffer windowId;
     GWorldPtr pixmap;
 #elif defined(OPENGL_WINDOWS)
     HDC displayId;		/* display context */