From 884f3c623d5f79bd6e2ebf2b2bc3319008b7e902 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 0ed580f45173f0703a01a4a00fa6021a82df72ce. Closes #17335. --- 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 0b7e6b0671..16dbb320a6 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -90,7 +90,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