Rewrite a chain of "if"s as a switch
No real changes, just make the code a bit more maintainable and easier to read.
This commit is contained in:
@@ -877,37 +877,34 @@ wxString wxLocale::GetSystemEncodingName()
|
|||||||
wxFontEncoding wxLocale::GetSystemEncoding()
|
wxFontEncoding wxLocale::GetSystemEncoding()
|
||||||
{
|
{
|
||||||
#if defined(__WIN32__)
|
#if defined(__WIN32__)
|
||||||
UINT codepage = ::GetACP();
|
const UINT codepage = ::GetACP();
|
||||||
|
|
||||||
// wxWidgets only knows about CP1250-1257, 874, 932, 936, 949, 950
|
switch ( codepage )
|
||||||
if ( codepage >= 1250 && codepage <= 1257 )
|
|
||||||
{
|
{
|
||||||
return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
|
case 1250:
|
||||||
}
|
case 1251:
|
||||||
|
case 1252:
|
||||||
|
case 1253:
|
||||||
|
case 1254:
|
||||||
|
case 1255:
|
||||||
|
case 1256:
|
||||||
|
case 1257:
|
||||||
|
return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
|
||||||
|
|
||||||
if ( codepage == 874 )
|
case 874:
|
||||||
{
|
return wxFONTENCODING_CP874;
|
||||||
return wxFONTENCODING_CP874;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( codepage == 932 )
|
case 932:
|
||||||
{
|
return wxFONTENCODING_CP932;
|
||||||
return wxFONTENCODING_CP932;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( codepage == 936 )
|
case 936:
|
||||||
{
|
return wxFONTENCODING_CP936;
|
||||||
return wxFONTENCODING_CP936;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( codepage == 949 )
|
case 949:
|
||||||
{
|
return wxFONTENCODING_CP949;
|
||||||
return wxFONTENCODING_CP949;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( codepage == 950 )
|
case 950:
|
||||||
{
|
return wxFONTENCODING_CP950;
|
||||||
return wxFONTENCODING_CP950;
|
|
||||||
}
|
}
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
CFStringEncoding encoding = 0 ;
|
CFStringEncoding encoding = 0 ;
|
||||||
|
Reference in New Issue
Block a user