fixup! Also accept wide string literals as translation macro arguments

Author: vadz

include/wx/translation.h

@@ -333,8 +333,18 @@ inline const wxString& wxGetTranslation(const char *str1,
                             wxString(context, conv));
 }
 
-    #define wxTRANS_INPUT_STR(s) wxASCII_STR(s)
-#else
+// We can't construct wxString implicitly in this case, so use a helper.
+inline wxString wxTRANS_INPUT_STR(const char* s)
+{
+    return wxString::FromAscii(s);
+}
+
+inline wxString wxTRANS_INPUT_STR(const wchar_t* s)
+{
+    return wxString(s);
+}
+#else // !wxNO_IMPLICIT_WXSTRING_ENCODING
+    // We can rely on implicit conversion, so don't bother with the helper.
     #define wxTRANS_INPUT_STR(s) s
 #endif // wxNO_IMPLICIT_WXSTRING_ENCODING
 

tests/allheaders.cpp

@@ -421,4 +421,10 @@ TEST_CASE("wxNO_IMPLICIT_WXSTRING_ENCODING", "[string]")
     wxPLURAL("singular", "plural", 2);
     wxGETTEXT_IN_CONTEXT("context", "text");
     wxGETTEXT_IN_CONTEXT_PLURAL("context", "singular", "plural", 3);
+
+    // Also wide strings can be used:
+    _(L"item");
+    wxGETTEXT_IN_CONTEXT(L"context", L"item");
+    wxPLURAL(L"sing", L"plur", 3);
+    wxGETTEXT_IN_CONTEXT_PLURAL(L"context", L"sing", L"plur", 3);
 }

tests/intl/intltest.cpp

@@ -796,14 +796,4 @@ TEST_CASE("wxUILocale::ShowSystem", "[.]")
     WARN("Preferred UI languages:\n" << preferredLangsStr);
 }
 
-// Not an actual test, but a way to ensure that wide string versions
-// of translation macros are available and successfully compile.
-static void EnsureWideStringVersionsOfMacrosExist() {
-    // Also wide strings can be used:
-    _(L"item");
-    wxGETTEXT_IN_CONTEXT(L"context", L"item");
-    wxPLURAL(L"sing", L"plur", 3);
-    wxGETTEXT_IN_CONTEXT_PLURAL(L"context", L"sing", L"plur", 3);
-}
-
 #endif // wxUSE_INTL