diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 17034b0bc1..f5c47bd001 100644
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -776,9 +776,9 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return false;
-    if ( l <= wxFONTWEIGHT_INVALID || l > wxFONTWEIGHT_MAX )
+    weight = wxFont::ConvertFromLegacyWeightIfNecessary(l);
+    if ( weight <= wxFONTWEIGHT_INVALID || weight > wxFONTWEIGHT_MAX )
         return false;
-    weight = static_cast<int>(l);
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 8dc154e8a5..ffbf99904c 100644
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -929,7 +929,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return false;
-    m_ctWeight = WXWeightToCT(l);
+    m_ctWeight = WXWeightToCT(wxFont::ConvertFromLegacyWeightIfNecessary(l));
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )