Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #420 from catalinr/fix_charset_comments

Browse Source 
Fix a couple of charset-related comments.

No real changes.
This commit is contained in:
VZ
2017-02-24 02:26:18 +01:00
committed by GitHub
parent 98720ee7a4 456eb42a92
commit bb8a7dc931
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/encinfo.h
View File

@@ -23,8 +23,8 @@
// Under X, it contains the last 2 elements of the font specifications // Under X, it contains the last 2 elements of the font specifications
// (registry and encoding). // (registry and encoding).
// //
// Under Windows, it contains a number which is one of predefined CHARSET_XXX // Under Windows, it contains a number which is one of predefined XXX_CHARSET
// values. // values (https://msdn.microsoft.com/en-us/library/cc250412.aspx).
// //
// Under all platforms it also contains a facename string which should be // 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 // used, if not empty, to create fonts in this encoding (this is the only way

3
src/osx/fontutil.cpp
View File

@@ -41,8 +41,7 @@ bool wxNativeEncodingInfo::FromString( const wxString& s )
wxString tmp = tokenizer.GetNextToken(); wxString tmp = tokenizer.GetNextToken();
if ( !tmp ) if ( !tmp )
{ {
// default charset (don't use DEFAULT_CHARSET though because of subtle // default charset
// Windows 9x/NT differences in handling it)
charset = 0; charset = 0;
} }
else else