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

Fix compilation ofr ports without native font info, such as wxDFB.

Browse Source 
Don't use wxString::ToLong() with short variable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-02-10 23:34:45 +00:00
parent ed7f03bbf3
commit 077c263a4c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/fontcmn.cpp
View File

@@ -603,12 +603,12 @@ void wxNativeFontInfo::SetFaceName(const wxArrayString& facenames)
bool wxNativeFontInfo::FromString(const wxString& s) bool wxNativeFontInfo::FromString(const wxString& s)
{ {
long l; long l;
short version; unsigned long version;
wxStringTokenizer tokenizer(s, wxT(";")); wxStringTokenizer tokenizer(s, wxT(";"));
wxString token = tokenizer.GetNextToken(); wxString token = tokenizer.GetNextToken();
if ( !token.ToLong(&version) || version < 0 || version > 1 ) if ( !token.ToULong(&version) || version > 1 )
return false; return false;
token = tokenizer.GetNextToken(); token = tokenizer.GetNextToken();