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 4fdf07c2407d372698e3c42e16fb11d1caeaef75..aa7468ef84d9416e29a0ab727e965f552fcc59b9 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/utils.mm
+// Name:        src/osx/carbon/utils.mm
 // Purpose:     various cocoa mixin utility functions
 // Author:      Stefan Csomor
 // Modified by:
@@ -21,6 +21,8 @@
 #include "wx/osx/private.h"
 #endif
 
+#include "wx/fontutil.h"
+
 #ifdef __WXMAC__
 
 #if wxOSX_USE_CARBON
@@ -44,15 +46,25 @@ wxMacAutoreleasePool::~wxMacAutoreleasePool()
 
 #endif
 
-#if defined( __WXCOCOCA__ ) || wxOSX_USE_COCOA
+#if wxOSX_USE_COCOA_OR_IPHONE
 
-CGContextRef wxMacGetContextFromCurrentNSContext()
+CGContextRef wxOSXGetContextFromCurrentNSContext()
 {
     CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext]
                                           graphicsPort];
     return context;
 }
 
+bool wxOSXLockFocus( WXWidget view) 
+{
+    return [view lockFocusIfCanDraw];
+}
+
+void wxOSXUnlockFocus( WXWidget view) 
+{
+    [view unlockFocus];
+}
+
 #endif
 
 // ----------------------------------------------------------------------------
@@ -69,19 +81,115 @@ void wxMacCocoaAutorelease( void* obj )
     [(NSObject*)obj autorelease];
 }
 
-void wxMacCocoaRetain( void* obj )
+void* wxMacCocoaRetain( void* obj )
 {
     [(NSObject*)obj retain];
+    return obj;
 }
 
+// ----------------------------------------------------------------------------
+// NSFont Utils
+// ----------------------------------------------------------------------------
+
 #if wxOSX_USE_COCOA
 
+WX_NSFont wxFont::OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
+{
+    NSFont* nsfont = nil;
+    switch( font )
+    {
+        case wxOSX_SYSTEM_FONT_NORMAL:
+            nsfont = [NSFont systemFontOfSize:[NSFont systemFontSize]];
+            break;
+        case wxOSX_SYSTEM_FONT_BOLD:
+            nsfont = [NSFont boldSystemFontOfSize:[NSFont systemFontSize]];
+            break;
+        case wxOSX_SYSTEM_FONT_SMALL:
+            nsfont = [NSFont systemFontOfSize:[NSFont smallSystemFontSize]];
+            break;
+        case wxOSX_SYSTEM_FONT_SMALL_BOLD:
+            nsfont = [NSFont boldSystemFontOfSize:[NSFont smallSystemFontSize]];
+            break;
+        case wxOSX_SYSTEM_FONT_MINI:
+            nsfont = [NSFont systemFontOfSize:[NSFont systemFontSize]];
+            break;
+       case wxOSX_SYSTEM_FONT_MINI_BOLD:
+            nsfont = [NSFont boldSystemFontOfSize:
+                [NSFont systemFontSizeForControlSize:NSMiniControlSize]];
+            break;
+        case wxOSX_SYSTEM_FONT_LABELS:
+            nsfont = [NSFont labelFontOfSize:
+                [NSFont systemFontSizeForControlSize:NSMiniControlSize]];
+            break;
+       case wxOSX_SYSTEM_FONT_VIEWS:
+            nsfont = [NSFont controlContentFontOfSize:0];
+            break;
+        default:
+            break;
+    }
+    [nsfont retain];
+    NSFontDescriptor*desc = [[nsfont fontDescriptor] retain];
+    if ( info->m_faceName.empty())
+    {
+        wxFontStyle fontstyle = wxFONTSTYLE_NORMAL;
+        wxFontWeight fontweight = wxFONTWEIGHT_NORMAL;
+        bool underlined = false;
+        
+        int size = (int) ([desc pointSize]+0.5);
+        NSFontSymbolicTraits traits = [desc symbolicTraits];
+            
+        if ( traits & NSFontBoldTrait )
+            fontweight = wxFONTWEIGHT_BOLD ;
+        else
+            fontweight = wxFONTWEIGHT_NORMAL ;
+        if ( traits & NSFontItalicTrait )
+            fontstyle = wxFONTSTYLE_ITALIC ;
+             
+        wxCFStringRef fontname( [desc postscriptName] );
+        info->Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
+            fontname.AsString(), wxFONTENCODING_DEFAULT);
+        
+    }
+    info->m_nsFontDescriptor = desc;
+    return nsfont;
+}
+
+void wxNativeFontInfo::OSXValidateNSFontDescriptor()
+{
+    NSFontDescriptor* desc  = [NSFontDescriptor fontDescriptorWithName:wxCFStringRef(m_faceName).AsNSString() size:m_pointSize];
+    NSFontSymbolicTraits traits = 0;
+
+    if (m_weight == wxFONTWEIGHT_BOLD)
+        traits |= NSFontBoldTrait;
+    if (m_style == wxFONTSTYLE_ITALIC || m_style == wxFONTSTYLE_SLANT)
+        traits |= NSFontItalicTrait;
+
+    if ( traits != 0 )
+    {
+        desc = [desc fontDescriptorWithSymbolicTraits:traits];
+    }
+    wxMacCocoaRetain(desc);
+    m_nsFontDescriptor = desc;
+}
+
+WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info)
+{
+    NSFont* nsFont;
+    nsFont = [NSFont fontWithDescriptor:info->m_nsFontDescriptor size:info->m_pointSize];
+    wxMacCocoaRetain(nsFont);
+    return nsFont;
+}
+
+#endif
+
 // ----------------------------------------------------------------------------
 // NSImage Utils
 // ----------------------------------------------------------------------------
 
+#if wxOSX_USE_COCOA
+
 //  From "Cocoa Drawing Guide:Working with Images"
-WX_NSImage  CreateNSImageFromCGImage( CGImageRef image )
+WX_NSImage  wxOSXCreateNSImageFromCGImage( CGImageRef image )
 {
     NSRect      imageRect    = NSMakeRect(0.0, 0.0, 0.0, 0.0);
     
@@ -98,6 +206,15 @@ WX_NSImage  CreateNSImageFromCGImage( CGImageRef image )
     CGContextDrawImage( imageContext, *(CGRect*)&imageRect, image );
     [newImage unlockFocus];
     
+    /*
+        // Create a bitmap rep from the image...
+        NSBitmapImageRep *bitmapRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
+        // Create an NSImage and add the bitmap rep to it...
+        NSImage *image = [[NSImage alloc] init];
+        [image addRepresentation:bitmapRep];
+        [bitmapRep release];
+    */
+    [newImage autorelease];
     return( newImage );
 }
 
@@ -215,7 +332,7 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
     case wxCURSOR_HAND:
         cursor = [[NSCursor pointingHandCursor] retain];
         break;
-
+        
     case wxCURSOR_BULLSEYE:
         cursor = wxGetStockCursor(kwxCursorBullseye);
         break;
@@ -260,6 +377,14 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
         cursor = wxGetStockCursor(kwxCursorRoller);
         break;
 
+    case wxCURSOR_OPEN_HAND:
+        cursor = [[NSCursor openHandCursor] retain];
+        break;
+
+    case wxCURSOR_CLOSED_HAND:
+        cursor = [[NSCursor closedHandCursor] retain];
+        break;
+
     case wxCURSOR_CHAR:
     case wxCURSOR_ARROW:
     case wxCURSOR_LEFT_BUTTON:
@@ -284,7 +409,7 @@ WX_NSCursor  wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hot
         firstTime = NO;
     }
     
-    NSImage    *nsImage  = CreateNSImageFromCGImage( cgImageRef );
+    NSImage    *nsImage  = wxOSXCreateNSImageFromCGImage( cgImageRef );
     NSCursor  *cursor    = [[NSCursor alloc] initWithImage:nsImage hotSpot:NSMakePoint( hotSpotX, hotSpotY )];
     
     [nsImage release];