X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d64bab7032e60cd07959abd0a7dd968f6b75778..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/osx/carbon/utilscocoa.mm

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 49fc2247d0..dc4248f3c7 100644
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/osx/carbon/utils.mm
+// Name:        src/osx/carbon/utilscocoa.mm
 // Purpose:     various cocoa mixin utility functions
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: utilscocoa.mm 48805 2007-09-19 14:52:25Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -353,10 +353,28 @@ WX_UIImage  wxOSXGetUIImageFromCGImage( CGImageRef image )
     return( newImage );
 }
 
+wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &client, const wxSize& size)
+{
+#if 1
+    // unfortunately this only accesses images in the app bundle, not the system wide globals
+    wxCFStringRef cfname(name);
+    return wxBitmap( [[UIImage imageNamed:cfname.AsNSString()] CGImage] );
+#else
+    return wxBitmap();
+#endif
+}
+
 #endif
 
 #if wxOSX_USE_COCOA
 
+wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &WXUNUSED(client), const wxSize& WXUNUSED(size))
+{
+    wxCFStringRef cfname(name);
+    wxCFRef<CGImageRef> image( wxOSXCreateCGImageFromNSImage([NSImage imageNamed:cfname.AsNSString()]) );
+    return wxBitmap( image );
+}
+
 //  From "Cocoa Drawing Guide:Working with Images"
 WX_NSImage  wxOSXGetNSImageFromCGImage( CGImageRef image )
 {
@@ -390,19 +408,22 @@ WX_NSImage  wxOSXGetNSImageFromCGImage( CGImageRef image )
 CGImageRef wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage )
 {
     // based on http://www.mail-archive.com/cocoa-dev@lists.apple.com/msg18065.html
-    
-    NSSize imageSize = [nsimage size];
-    CGColorSpaceRef genericRGB = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); 
-    CGContextRef context = CGBitmapContextCreate(NULL, imageSize.width, imageSize.height, 8, 0, genericRGB, kCGImageAlphaPremultipliedFirst); 
-    NSGraphicsContext *nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
-    [NSGraphicsContext saveGraphicsState];
-    [NSGraphicsContext setCurrentContext:nsGraphicsContext];
-    [[NSColor whiteColor] setFill];
-    NSRectFill(NSMakeRect(0.0, 0.0, imageSize.width, imageSize.height));
-    [nsimage drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
-    [NSGraphicsContext setCurrentContext:nsGraphicsContext];
-    CGImageRef image = CGBitmapContextCreateImage(context);
-    CFRelease(context);
+
+    CGImageRef image = NULL;
+    if (nsimage != nil)
+    {
+        NSSize imageSize = [nsimage size];
+        CGContextRef context = CGBitmapContextCreate(NULL, imageSize.width, imageSize.height, 8, 0, wxMacGetGenericRGBColorSpace(), kCGImageAlphaPremultipliedFirst); 
+        NSGraphicsContext *nsGraphicsContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
+        [NSGraphicsContext saveGraphicsState];
+        [NSGraphicsContext setCurrentContext:nsGraphicsContext];
+        [[NSColor whiteColor] setFill];
+        NSRectFill(NSMakeRect(0.0, 0.0, imageSize.width, imageSize.height));
+        [nsimage drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0];
+        [NSGraphicsContext setCurrentContext:nsGraphicsContext];
+        image = CGBitmapContextCreateImage(context);
+        CFRelease(context);
+    }
     return image;
  }
 
@@ -494,8 +515,11 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
 
     case wxCURSOR_WATCH:
     case wxCURSOR_WAIT:
-        // should be displayed by the system when things are running
-        cursor = [[NSCursor arrowCursor] retain];
+        // an arrow should be displayed by the system when things are running
+        // according to the HIG
+        // cursor = [[NSCursor arrowCursor] retain];
+        // but for crossplatform compatibility we display a watch cursor
+        cursor = wxGetStockCursor(kwxCursorWatch);
         break;
 
     case wxCURSOR_IBEAM: