fix in fontspec parsing

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 5e9d1ce629aec4527207a93e0d9f0d1444302985..02d61bff580b28bb29ae61ea54ee99fae35fa8ac 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -166,6 +166,7 @@ wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata )
 
     wxStringTokenizer tn( fontname, wxT("-") );
 
 
     wxStringTokenizer tn( fontname, wxT("-") );
 

+    tn.GetNextToken();                           // skip initial empty token

     tn.GetNextToken();                           // foundry
 
     M_FONTDATA->m_faceName = tn.GetNextToken();  // family
     tn.GetNextToken();                           // foundry
 
     M_FONTDATA->m_faceName = tn.GetNextToken();  // family

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 5e9d1ce629aec4527207a93e0d9f0d1444302985..02d61bff580b28bb29ae61ea54ee99fae35fa8ac 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -166,6 +166,7 @@ wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata )
 
     wxStringTokenizer tn( fontname, wxT("-") );
 
 
     wxStringTokenizer tn( fontname, wxT("-") );
 

+    tn.GetNextToken();                           // skip initial empty token

     tn.GetNextToken();                           // foundry
 
     M_FONTDATA->m_faceName = tn.GetNextToken();  // family
     tn.GetNextToken();                           // foundry
 
     M_FONTDATA->m_faceName = tn.GetNextToken();  // family