FormSpec: Add StaticTextSpec and superimpose over item image buttons

[minetest.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index 8e6282887632e81e0a9534ec6d6f699823b78aad..b8d27f77ceb82a2b229ba8e01b24b4baf461a0cd 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -23,34 +23,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h" // for USE_GETTEXT
 
 #if USE_GETTEXT
-#include <libintl.h>
+       #include <libintl.h>
 #else
-#define gettext(String) String
+       #define gettext(String) String
 #endif
 
 #define _(String) gettext(String)
-#define gettext_noop(String) String
-#define N_(String) gettext_noop (String)
+#define gettext_noop(String) (String)
+#define N_(String) gettext_noop((String))
 
-#ifdef _MSC_VER
-void init_gettext(const char *path, const std::string &configured_language, int argc, char** argv);
-#else
-void init_gettext(const char *path, const std::string &configured_language);
-#endif
-
-extern const wchar_t *narrow_to_wide_c(const char *mbs);
-extern std::wstring narrow_to_wide(const std::string &mbs);
+void init_gettext(const char *path, const std::string &configured_language,
+       int argc, char *argv[]);
 
+extern wchar_t *utf8_to_wide_c(const char *str);
 
 // You must free the returned string!
+// The returned string is allocated using new
 inline const wchar_t *wgettext(const char *str)
 {
-       return narrow_to_wide_c(gettext(str));
-}
-
-inline std::wstring wstrgettext(const std::string &text)
-{
-       return narrow_to_wide(gettext(text.c_str()));
+       return utf8_to_wide_c(gettext(str));
 }
 
 inline std::string strgettext(const std::string &text)