font is only non default if it has non default field values

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-12 12:39:33 +00:00
parent 4ed40684b4
commit b4e4abb51c

View File

@@ -391,16 +391,20 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
return FALSE; return FALSE;
} }
fontElements[n] = tokenizer.GetNextToken(); wxString field = tokenizer.GetNextToken();
if ( !field.empty() && field != _T('*') )
{
// we're really initialized now
m_isDefault = FALSE;
}
fontElements[n] = field;
} }
// this should be all // this should be all
if ( tokenizer.HasMoreTokens() ) if ( tokenizer.HasMoreTokens() )
return FALSE; return FALSE;
// we're initialized now
m_isDefault = FALSE;
return TRUE; return TRUE;
} }