[GRASS-SVN] r33323 - in grass/trunk: gui/wxpython/nviz include

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-09-07 16:11:03 -0400 (Sun, 07 Sep 2008)
New Revision: 33323

Modified:
   grass/trunk/gui/wxpython/nviz/nviz.h
   grass/trunk/gui/wxpython/nviz/nviz.i
   grass/trunk/include/nviz.h
Log:
nvizlib: Mac-related fixes (thanks to William Kyngesburye)
(merge from devbr6, r33321)


Modified: grass/trunk/gui/wxpython/nviz/nviz.h
===================================================================
--- grass/trunk/gui/wxpython/nviz/nviz.h	2008-09-07 20:10:20 UTC (rev 33322)
+++ grass/trunk/gui/wxpython/nviz/nviz.h	2008-09-07 20:11:03 UTC (rev 33323)
@@ -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".

Modified: grass/trunk/gui/wxpython/nviz/nviz.i
===================================================================
--- grass/trunk/gui/wxpython/nviz/nviz.i	2008-09-07 20:10:20 UTC (rev 33322)
+++ grass/trunk/gui/wxpython/nviz/nviz.i	2008-09-07 20:11:03 UTC (rev 33323)
@@ -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"

Modified: grass/trunk/include/nviz.h
===================================================================
--- grass/trunk/include/nviz.h	2008-09-07 20:10:20 UTC (rev 33322)
+++ grass/trunk/include/nviz.h	2008-09-07 20:11:03 UTC (rev 33323)
@@ -128,9 +128,9 @@
     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 */