minor fixes; replace references to Windows95 with references to wxMSW where possible

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

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index e2ac95f9e6e4ebc9d0b3ff129742c9d1648aed8a..9420e4c9ac4505c1ce0ac0e9165b2a764d818e8e 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:
 // Purpose:     various cocoa mixin utility functions
 // Author:      Stefan Csomor
 // Modified by:


@@ -11,20 +11,26 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxOSX_USE_COCOA_OR_CARBON

 #include <Cocoa/Cocoa.h>
 #include <Cocoa/Cocoa.h>

+#else
+#import <UIKit/UIKit.h>
+#endif

 
 #ifdef __WXMAC__
 
 #ifdef __WXMAC__

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 #endif
 
 #ifdef __WXMAC__
 
 #endif
 
 #ifdef __WXMAC__
 

+#if wxOSX_USE_CARBON

 bool wxMacInitCocoa()
 {
     bool cocoaLoaded = NSApplicationLoad();
     wxASSERT_MSG(cocoaLoaded,wxT("Couldn't load Cocoa in Carbon Environment")) ;
     return cocoaLoaded;
 }
 bool wxMacInitCocoa()
 {
     bool cocoaLoaded = NSApplicationLoad();
     wxASSERT_MSG(cocoaLoaded,wxT("Couldn't load Cocoa in Carbon Environment")) ;
     return cocoaLoaded;
 }

+#endif

 
 wxMacAutoreleasePool::wxMacAutoreleasePool()
 {
 
 wxMacAutoreleasePool::wxMacAutoreleasePool()
 {


@@ -38,7 +44,7 @@ wxMacAutoreleasePool::~wxMacAutoreleasePool()
 
 #endif
 
 
 #endif
 

-#ifdef __WXCOCOCA__
+#if defined( __WXCOCOCA__ ) || wxOSX_USE_COCOA

 
 CGContextRef wxMacGetContextFromCurrentNSContext()
 {
 
 CGContextRef wxMacGetContextFromCurrentNSContext()
 {


@@ -68,12 +74,14 @@ void wxMacCocoaRetain( void* obj )
     [(NSObject*)obj retain];
 }
 
     [(NSObject*)obj retain];
 }
 

+#if wxOSX_USE_COCOA
+

 // ----------------------------------------------------------------------------
 // NSImage Utils
 // ----------------------------------------------------------------------------
 
 //  From "Cocoa Drawing Guide:Working with Images"
 // ----------------------------------------------------------------------------
 // NSImage Utils
 // ----------------------------------------------------------------------------
 
 //  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);
     
 {
     NSRect      imageRect    = NSMakeRect(0.0, 0.0, 0.0, 0.0);
     


@@ -90,6 +98,15 @@ WX_NSImage  CreateNSImageFromCGImage( CGImageRef image )
     CGContextDrawImage( imageContext, *(CGRect*)&imageRect, image );
     [newImage unlockFocus];
     
     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 );
 }
 
     return( newImage );
 }
 


@@ -97,8 +114,6 @@ WX_NSImage  CreateNSImageFromCGImage( CGImageRef image )
 // NSCursor Utils
 // ----------------------------------------------------------------------------
 
 // NSCursor Utils
 // ----------------------------------------------------------------------------
 

-#if wxMAC_USE_COCOA
-

 // copied from cursor.mm
 
 static NSCursor* wxGetStockCursor( short sIndex )
 // copied from cursor.mm
 
 static NSCursor* wxGetStockCursor( short sIndex )


@@ -278,7 +293,7 @@ WX_NSCursor  wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hot
         firstTime = NO;
     }
     
         firstTime = NO;
     }
     

-    NSImage    *nsImage  = CreateNSImageFromCGImage( cgImageRef );
+    NSImage    *nsImage  = wxOSXCreateNSImageFromCGImage( cgImageRef );

     NSCursor  *cursor    = [[NSCursor alloc] initWithImage:nsImage hotSpot:NSMakePoint( hotSpotX, hotSpotY )];
     
     [nsImage release];
     NSCursor  *cursor    = [[NSCursor alloc] initWithImage:nsImage hotSpot:NSMakePoint( hotSpotX, hotSpotY )];
     
     [nsImage release];


@@ -302,3 +317,4 @@ void  wxMacCocoaShowCursor()
 }
 
 #endif
 }
 
 #endif

+