From adb48b3c727654a2a9fd90f432f14a7b53edead5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 17 Jan 2016 14:09:04 +0100 Subject: [PATCH] Fix wxMSW wxMimeTypesManager compilation in UTF-8 build Use wxStringCharType with wxS(), not wxChar (which should be used with wxT()) to fix UTF-8 build after a487dc88c18e4b9a2d1dfe32ee9dd2c352028829. Closes #17335. (cherry picked from commit 884f3c623d5f79bd6e2ebf2b2bc3319008b7e902) --- src/msw/mimetype.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index 356102d866..49900edef1 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -75,7 +75,7 @@ class WXDLLIMPEXP_FWD_CORE wxIcon; // permissions. So the right thing to do is to use HKCR when reading, to // respect both per-user and machine-global associations, but only write under // HKCU. -static const wxChar *CLASSES_ROOT_KEY = wxS("Software\\Classes\\"); +static const wxStringCharType *CLASSES_ROOT_KEY = wxS("Software\\Classes\\"); // although I don't know of any official documentation which mentions this // location, uses it, so it isn't likely to change