m_configIsDummy = FALSE;
// FIXME: ideally, we should add keys from dummy config to the real one now,
// but it is a low-priority task because typical wxWin application
- // either doesn't use wxConfig at all or creates wxConfig object in
- // wxApp::OnInit(), before any real interaction with the user takes
+ // either doesn't use wxConfig at all or creates wxConfig object in
+ // wxApp::OnInit(), before any real interaction with the user takes
// place...
}
encoding = (wxFontEncoding)value;
}
}
+
+ switch ( value )
+ {
+ case 932:
+ encoding = wxFONTENCODING_CP932;
+ break;
+
+ case 936:
+ encoding = wxFONTENCODING_CP936;
+ break;
+
+ case 949:
+ encoding = wxFONTENCODING_CP949;
+ break;
+
+ case 950:
+ encoding = wxFONTENCODING_CP950;
+ break;
+ }
}
}
}
#ifdef __WIN32__
UINT codepage = ::GetACP();
- // wxWindows only knows about CP1250-1257
+ // wxWindows only knows about CP1250-1257, 932, 936, 949, 950
if ( codepage >= 1250 && codepage <= 1257 )
{
return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
}
+
+ if ( codepage == 932 )
+ {
+ return wxFONTENCODING_CP932;
+ }
+
+ if ( codepage == 936 )
+ {
+ return wxFONTENCODING_CP936;
+ }
+
+ if ( codepage == 949 )
+ {
+ return wxFONTENCODING_CP949;
+ }
+
+ if ( codepage == 950 )
+ {
+ return wxFONTENCODING_CP950;
+ }
#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
wxString encname = GetSystemEncodingName();
if ( !encname.empty() )