[GRASS-SVN] r40032 - grass/branches/releasebranch_6_4/gui/wxpython/vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-12-16 16:21:10 -0500 (Wed, 16 Dec 2009)
New Revision: 40032

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/vdigit/digit.cpp
   grass/branches/releasebranch_6_4/gui/wxpython/vdigit/driver.cpp
   grass/branches/releasebranch_6_4/gui/wxpython/vdigit/line.cpp
   grass/branches/releasebranch_6_4/gui/wxpython/vdigit/message.cpp
Log:
wxGUI/vdigit: minor fixes
             (merge r40030 from trunk)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/vdigit/digit.cpp
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/vdigit/digit.cpp	2009-12-16 21:11:52 UTC (rev 40031)
+++ grass/branches/releasebranch_6_4/gui/wxpython/vdigit/digit.cpp	2009-12-16 21:21:10 UTC (rev 40032)
@@ -12,17 +12,21 @@
    \author Martin Landa <landa.martin gmail.com>
 */
 
+extern "C" {
+#include <grass/glocale.h>
+}
+
 #include "driver.h"
 #include "digit.h"
 
-#ifdef _WIN32
+#if defined _WIN32 && defined MSVC_VER
 #ifndef _CPPRTTI
 #error "compile with /GR!"
 #endif
 #endif
 
 /**
-   \brief Initialize digit interface used by SWIG
+   \brief Initialize digit interface
 
    \param driver display driver instance
    \param window parent window for message dialog

Modified: grass/branches/releasebranch_6_4/gui/wxpython/vdigit/driver.cpp
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/vdigit/driver.cpp	2009-12-16 21:11:52 UTC (rev 40031)
+++ grass/branches/releasebranch_6_4/gui/wxpython/vdigit/driver.cpp	2009-12-16 21:21:10 UTC (rev 40032)
@@ -15,6 +15,7 @@
    \author Martin Landa <landa.martin gmail.com>
 */
 
+#include <unistd.h>
 #include <cmath>
 
 #include "driver.h"

Modified: grass/branches/releasebranch_6_4/gui/wxpython/vdigit/line.cpp
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/vdigit/line.cpp	2009-12-16 21:11:52 UTC (rev 40031)
+++ grass/branches/releasebranch_6_4/gui/wxpython/vdigit/line.cpp	2009-12-16 21:21:10 UTC (rev 40032)
@@ -15,7 +15,9 @@
 extern "C" {
 #include <grass/vedit.h>
 #include <grass/dbmi.h>
+#include <grass/glocale.h>
 }
+
 #include "driver.h"
 #include "digit.h"
 

Modified: grass/branches/releasebranch_6_4/gui/wxpython/vdigit/message.cpp
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/vdigit/message.cpp	2009-12-16 21:11:52 UTC (rev 40031)
+++ grass/branches/releasebranch_6_4/gui/wxpython/vdigit/message.cpp	2009-12-16 21:21:10 UTC (rev 40032)
@@ -12,6 +12,10 @@
    \author Martin Landa <landa.martin gmail.com>
 */
 
+extern "C" {
+#include <grass/glocale.h>
+}
+
 #include "driver.h"
 #include "digit.h"