Explicitly set "C" locale for the tests using decimal point.

[wxWidgets.git] / src / osx / carbon / utilscocoa.mm

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index ae7df72070e87cbe758a977bfce6d301c5f0dead..49fc2247d066943a578cbb173037f6bd6b11986a 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -244,7 +244,11 @@ WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info)
                     remainingTraits &= ~NSBoldFontMask;
                 }
             }
                     remainingTraits &= ~NSBoldFontMask;
                 }
             }

-            if ( remainingTraits & NSItalicFontMask)
+            // the code below causes crashes, because fontDescriptorWithMatrix is not returning a valid font descriptor
+            // it adds a NSCTFontMatrixAttribute as well which cannot be disposed of correctly by the autorelease pool
+            // so at the moment we have to disable this and cannot synthesize italic fonts if they are not available on the system
+#if 0
+            if ( remainingTraits & NSItalicFontMask )

             {
                 if ( nsFontWithTraits == nil )
                     nsFontWithTraits = nsFont;
             {
                 if ( nsFontWithTraits == nil )
                     nsFontWithTraits = nsFont;


@@ -260,6 +264,7 @@ WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info)
                         nsFontWithTraits = f;
                 }
             }
                         nsFontWithTraits = f;
                 }
             }

+#endif

             if ( nsFontWithTraits != nil )
                 nsFont = nsFontWithTraits;
         }
             if ( nsFontWithTraits != nil )
                 nsFont = nsFontWithTraits;
         }