fixing NSFontDescriptor matching for font weights and styles, fixes #11910

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

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index c787a15a336ae56a19b540f79feda2efa5c3e7ae..394b02b07619204373fa10d5d7027b2985c925c2 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -192,12 +192,16 @@ void wxNativeFontInfo::OSXValidateNSFontDescriptor()
 
     if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)
         traits |= NSFontItalicTrait;
 
     if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)
         traits |= NSFontItalicTrait;

-
+    
+    NSDictionary* traitsdict = [NSDictionary dictionaryWithObjectsAndKeys:
+                           [NSNumber numberWithUnsignedInt:traits], NSFontSymbolicTrait,
+                           nil] ;
+     

     desc = [NSFontDescriptor fontDescriptorWithFontAttributes:
         [NSDictionary dictionaryWithObjectsAndKeys:
             wxCFStringRef(m_faceName).AsNSString(), NSFontFamilyAttribute,
             [NSNumber numberWithFloat:m_pointSize], NSFontSizeAttribute,
     desc = [NSFontDescriptor fontDescriptorWithFontAttributes:
         [NSDictionary dictionaryWithObjectsAndKeys:
             wxCFStringRef(m_faceName).AsNSString(), NSFontFamilyAttribute,
             [NSNumber numberWithFloat:m_pointSize], NSFontSizeAttribute,

-            [NSNumber numberWithUnsignedInt:traits], NSFontSymbolicTrait,
+            traitsdict, NSFontTraitsAttribute,

             [NSNumber numberWithFloat:weight],NSFontWeightTrait,
             nil]];
 
             [NSNumber numberWithFloat:weight],NSFontWeightTrait,
             nil]];