move wxGridCellRenderer::Draw before other derived classes implementations (no real...

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

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 9420e4c9ac4505c1ce0ac0e9165b2a764d818e8e..1617dd37f6304a2d254e8c8842f13014ef557012 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -44,15 +44,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
 
 // ----------------------------------------------------------------------------
@@ -224,7 +234,7 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
     case wxCURSOR_HAND:
         cursor = [[NSCursor pointingHandCursor] retain];
         break;
-
+        
     case wxCURSOR_BULLSEYE:
         cursor = wxGetStockCursor(kwxCursorBullseye);
         break;
@@ -269,6 +279,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: