From dbe7347394245b5b1629593e43537d66f0c12a21 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sat, 12 Jul 2003 23:14:45 +0000 Subject: [PATCH] Font is only non default if it has non default field values. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/fontutil.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 66e893e602..6e14008c6c 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -376,6 +376,9 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) // TODO: we should be able to handle the font aliases here, but how? wxStringTokenizer tokenizer(fontname, _T("-")); + // we're not initialized yet. + m_isDefault = TRUE; + // skip the leading, usually empty field (font name registry) if ( !tokenizer.HasMoreTokens() ) return FALSE; @@ -389,17 +392,20 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname) // not enough elements in the XLFD - or maybe an alias return FALSE; } + + wxString field = tokenizer.GetNextToken(); + if (!field.empty() && field != _T('*')) { + // we're really initialized now + m_isDefault = FALSE; + } - fontElements[n] = tokenizer.GetNextToken(); + fontElements[n] = field; } // this should be all if ( tokenizer.HasMoreTokens() ) return FALSE; - - // we're initialized now - m_isDefault = FALSE; - + return TRUE; }