X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasics%2FBasics_Utils.hxx;h=9edc2ceeac7a170e55843354143525ad57689e91;hb=d1070d09cfbba6d9b72d8f2ca8d07d23f296686c;hp=3468d205e80714726843952ef4929f8009684318;hpb=a7e425483b5eb6a0491cbad5ef63cc67ccf64f7c;p=modules%2Fkernel.git

diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx
index 3468d205e..9edc2ceea 100644
--- a/src/Basics/Basics_Utils.hxx
+++ b/src/Basics/Basics_Utils.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -34,8 +34,12 @@
 #else
 #include <windows.h>
 #pragma comment(lib,"winmm.lib")
+#pragma warning (disable : 4251)
 #endif
 
+#ifndef SALOME_UNUSED
+#define SALOME_UNUSED(var) (void)var
+#endif
 
 namespace Kernel_Utils
 {
@@ -45,9 +49,13 @@ namespace Kernel_Utils
   {
   public:
     Localizer();
+    Localizer(int, const char*);
     ~Localizer();
   private:
-    std::string myCurLocale;
+    void init(int, const char*);
+  private:
+    int myCategory;
+    std::string myOriginalLocale;
   };
   
   //! GUID type
@@ -56,10 +64,17 @@ namespace Kernel_Utils
     ObjectdID       //!< Global usage object identifier ID
   };
 
-  const wchar_t* decode(const char* encoded);
-  const wchar_t* decode_s(std::string encoded);
-  const char* encode(const wchar_t* decoded);
-  std::string encode_s(const wchar_t* decoded);
+  BASICS_EXPORT const wchar_t* decode(const char* encoded);
+  BASICS_EXPORT const wchar_t* decode_s(std::string encoded);
+  BASICS_EXPORT const char* encode(const wchar_t* decoded);
+  BASICS_EXPORT std::string encode_s(const wchar_t* decoded);
+
+#ifdef WIN32
+  BASICS_EXPORT char* utf8_encode(const wchar_t* encoded);
+  BASICS_EXPORT wchar_t* utf8_decode(const char* decoded);
+  BASICS_EXPORT std::string utf8_encode_s(const std::wstring& encoded);
+  BASICS_EXPORT std::wstring utf8_decode_s(const std::string& decoded);
+#endif
 
   //! Get predefined GUID
   BASICS_EXPORT std::string GetGUID( GUIDtype );