Use fixed size for builtin menus on non-android platforms

[minetest.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index 77fab895b9f96f33e4070f43c03e247faf98b54d..dce45fa3aafd3b339bbf843cbcb6fc5ab3b53c5b 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef GETTEXT_HEADER
 #define GETTEXT_HEADER
 
-//#include "config.h" // for USE_GETTEXT
+#include "config.h" // for USE_GETTEXT
 
 #if USE_GETTEXT
 #include <libintl.h>
@@ -41,16 +41,19 @@ void init_gettext(const char *path, const std::string &configured_language);
 extern const wchar_t *narrow_to_wide_c(const char *mbs);
 extern std::wstring narrow_to_wide(const std::string &mbs);
 
-
 // You must free the returned string!
 inline const wchar_t *wgettext(const char *str)
 {
        return narrow_to_wide_c(gettext(str));
 }
 
+// Gettext under MSVC needs this strange way. Just don't ask...
 inline std::wstring wstrgettext(const std::string &text)
 {
-       return narrow_to_wide(gettext(text.c_str()));
+       const wchar_t *tmp = wgettext(text.c_str());
+       std::wstring retval = (std::wstring)tmp;
+       delete[] tmp;
+       return retval;
 }
 
 inline std::string strgettext(const std::string &text)