X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7a49742ec6b4effe012dc7204db307e1267bf6a..038c99477c8cd14013cef892517012717c47df35:/src/common/fontcmn.cpp diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index fed694a96d..aeeccfb9e3 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -603,12 +603,12 @@ void wxNativeFontInfo::SetFaceName(const wxArrayString& facenames) bool wxNativeFontInfo::FromString(const wxString& s) { long l; - short version; + unsigned long version; wxStringTokenizer tokenizer(s, wxT(";")); wxString token = tokenizer.GetNextToken(); - if ( !token.ToLong(&version) || version < 0 || version > 1 ) + if ( !token.ToULong(&version) || version > 1 ) return false; token = tokenizer.GetNextToken(); @@ -842,7 +842,7 @@ wxString wxNativeFontInfo::ToUserString() const // that the different words which compose this facename are // not different adjectives or other data but rather all parts // of the facename - desc << wxT(" '") << face << _("'"); + desc << wxT(" '") << face << wxT("'"); } else desc << wxT(' ') << face;