From 882e109ed57809ced1fa69938572a8bb1431143f Mon Sep 17 00:00:00 2001 From: Catalin Date: Thu, 23 Feb 2017 19:20:20 +0200 Subject: [PATCH 1/2] Improved description of charset values under MSW. --- include/wx/encinfo.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/encinfo.h b/include/wx/encinfo.h index 66b00034e5..176da52e83 100644 --- a/include/wx/encinfo.h +++ b/include/wx/encinfo.h @@ -23,8 +23,8 @@ // Under X, it contains the last 2 elements of the font specifications // (registry and encoding). // -// Under Windows, it contains a number which is one of predefined CHARSET_XXX -// values. +// Under Windows, it contains a number which is one of predefined XXX_CHARSET +// values (https://msdn.microsoft.com/en-us/library/cc250412.aspx). // // Under all platforms it also contains a facename string which should be // used, if not empty, to create fonts in this encoding (this is the only way From 456eb42a9283eaa7b74a3b19cdb214924db22db2 Mon Sep 17 00:00:00 2001 From: Catalin Date: Thu, 23 Feb 2017 19:23:35 +0200 Subject: [PATCH 2/2] Removed irrelevant comment about MSW charset in OSX code. --- src/osx/fontutil.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/osx/fontutil.cpp b/src/osx/fontutil.cpp index 35d9cdc62b..5828657448 100644 --- a/src/osx/fontutil.cpp +++ b/src/osx/fontutil.cpp @@ -41,8 +41,7 @@ bool wxNativeEncodingInfo::FromString( const wxString& s ) wxString tmp = tokenizer.GetNextToken(); if ( !tmp ) { - // default charset (don't use DEFAULT_CHARSET though because of subtle - // Windows 9x/NT differences in handling it) + // default charset charset = 0; } else