revert to proper defaults for US

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

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index bf7392e89239256ca1dfe6620ec62a90520b7da1..aa7468ef84d9416e29a0ab727e965f552fcc59b9 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -93,9 +93,9 @@ void* wxMacCocoaRetain( void* obj )
 
 #if wxOSX_USE_COCOA
 
 
 #if wxOSX_USE_COCOA
 

-WX_NSFont wxFont::CreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
+WX_NSFont wxFont::OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)

 {
 {

-    NSFont* nsfont;
+    NSFont* nsfont = nil;

     switch( font )
     {
         case wxOSX_SYSTEM_FONT_NORMAL:
     switch( font )
     {
         case wxOSX_SYSTEM_FONT_NORMAL:


@@ -154,7 +154,7 @@ WX_NSFont wxFont::CreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
     return nsfont;
 }
 
     return nsfont;
 }
 

-void wxNativeFontInfo::ValidateNSFontDescriptor()
+void wxNativeFontInfo::OSXValidateNSFontDescriptor()

 {
     NSFontDescriptor* desc  = [NSFontDescriptor fontDescriptorWithName:wxCFStringRef(m_faceName).AsNSString() size:m_pointSize];
     NSFontSymbolicTraits traits = 0;
 {
     NSFontDescriptor* desc  = [NSFontDescriptor fontDescriptorWithName:wxCFStringRef(m_faceName).AsNSString() size:m_pointSize];
     NSFontSymbolicTraits traits = 0;


@@ -172,7 +172,7 @@ void wxNativeFontInfo::ValidateNSFontDescriptor()
     m_nsFontDescriptor = desc;
 }
 
     m_nsFontDescriptor = desc;
 }
 

-WX_NSFont wxFont::CreateNSFont(const wxNativeFontInfo* info)
+WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info)

 {
     NSFont* nsFont;
     nsFont = [NSFont fontWithDescriptor:info->m_nsFontDescriptor size:info->m_pointSize];
 {
     NSFont* nsFont;
     nsFont = [NSFont fontWithDescriptor:info->m_nsFontDescriptor size:info->m_pointSize];