rework locale-guard for C and C++ locales

let's hope querying the C-locale is more lightweight than setting it
on windows.

1 files changed, 12 insertions, 11 deletions

diff --git a/libs/pbd/pbd/locale_guard.h b/libs/pbd/pbd/locale_guard.h
index dc82ab4483..3d37562ced 100644
--- a/libs/pbd/pbd/locale_guard.h
+++ b/libs/pbd/pbd/locale_guard.h
@@ -22,20 +22,21 @@
 
 #include "pbd/libpbd_visibility.h"
 
-#include <string>
+#include <locale>
 
 namespace PBD {
 
-struct LIBPBD_API LocaleGuard {
-    LocaleGuard (const char*);
-    ~LocaleGuard ();
-
-	static std::string current;
-
-private:
-    char* old;
-};
-
+	struct LIBPBD_API LocaleGuard {
+		public:
+			LocaleGuard ();
+			LocaleGuard (const char*); // deprecated
+			~LocaleGuard ();
+
+		private:
+			void init ();
+			std::locale old_cpp;
+			char* old_c;
+	};
 }
 
 #endif /* __pbd_locale_guard__ */