From c5f8cefe1e26eb1fb8dcbe6efc628ef19a4e6f80 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 28 Oct 2022 19:57:13 +0100 Subject: [PATCH] Remove another not really UTF-8 related FIXME comment The question of which type should be used in the absence of the format string still seems to be valid, but not really related to using (or not) UTF-8. Leave the comment, but remove the FIXME, as it almost certainly won't be fixed (but hopefully all this code might get removed as part of #22880). Also replace a leftover NULL with nullptr for consistency and to pacify the code style check. --- include/wx/strvararg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index ad946a2158..45f009739c 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -842,8 +842,8 @@ struct wxArgNormalizerNarrowChar wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_Char | wxFormatString::Arg_Int ); - // FIXME-UTF8: which one is better default in absence of fmt string - // (i.e. when used like e.g. Foo("foo", "bar", 'c', NULL)? + // We use char if there is no format string at all, i.e. when used like + // e.g. Foo("foo", "bar", 'c', nullptr), but is this the bast choice? if ( !fmt || fmt->GetArgumentType(index) == wxFormatString::Arg_Char ) m_value = wx_truncate_cast(T, wxUniChar(value).GetValue()); else