[GRASS-SVN] r32079 - in grass/branches/develbranch_6: gui/wxpython/vdigit lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-11 13:10:19 -0400 (Fri, 11 Jul 2008)
New Revision: 32079

Modified:
   grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp
   grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp
   grass/branches/develbranch_6/lib/gis/gisinit.c
Log:
setlocate(LC_NUMERIC, "C") moved to gisinit() [merged from trunk r32078]

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp	2008-07-11 17:06:19 UTC (rev 32078)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/digit.cpp	2008-07-11 17:10:19 UTC (rev 32079)
@@ -14,8 +14,6 @@
    \date 2008
 */
 
-#include <clocale>
-
 #include "driver.h"
 #include "digit.h"
 
@@ -26,8 +24,6 @@
 */
 Digit::Digit(DisplayDriver *ddriver)
 {
-    setlocale(LC_NUMERIC, "C");
-
     display = ddriver;
 
     if (display->mapInfo) {

Modified: grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp	2008-07-11 17:06:19 UTC (rev 32078)
+++ grass/branches/develbranch_6/gui/wxpython/vdigit/driver.cpp	2008-07-11 17:10:19 UTC (rev 32079)
@@ -17,7 +17,6 @@
 */
 
 #include <cmath>
-#include <clocale>
 
 #include "driver.h"
 
@@ -32,8 +31,6 @@
 */
 DisplayDriver::DisplayDriver(void *device)
 {
-    setlocale(LC_NUMERIC, "C");
-
     G_gisinit(""); /* GRASS functions */
 
     mapInfo = NULL;

Modified: grass/branches/develbranch_6/lib/gis/gisinit.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/gisinit.c	2008-07-11 17:06:19 UTC (rev 32078)
+++ grass/branches/develbranch_6/lib/gis/gisinit.c	2008-07-11 17:10:19 UTC (rev 32079)
@@ -15,6 +15,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <locale.h>
+
 #include <grass/gis.h>
 #include "G.h"
 #include <grass/glocale.h>
@@ -133,5 +135,7 @@
 
     initialized = 1;
 
+    setlocale(LC_NUMERIC, "C");
+
     return 0;
 }