Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / common / numformatter.cpp

diff --git a/src/common/numformatter.cpp b/src/common/numformatter.cpp
index e89a7cd240b2d37da981fcbc286b84c26b5847ec..7b110abc18f840943e729600efb2426a33331b2b 100644 (file)
--- a/src/common/numformatter.cpp
+++ b/src/common/numformatter.cpp
@@ -21,6 +21,10 @@
 #include "wx/numformatter.h"
 #include "wx/intl.h"
 
+#if !wxUSE_STD_STRING
+    #include <locale.h> // for setlocale and LC_ALL
+#endif
+
 // ----------------------------------------------------------------------------
 // local helpers
 // ----------------------------------------------------------------------------