X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9df4fb452e785836de38712af84d209113b5af..b5a9b87e1620e52f1f13d2619b4677f2b365c93f:/src/osx/cocoa/utils.mm?ds=sidebyside

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 173df9c046..3fdecac375 100644
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -76,12 +76,14 @@ void wxMacWakeUp()
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {
+    wxUnusedVar(sender);
     // let wx do this, not cocoa
     return NO;
 }
 
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
 {
+    wxUnusedVar(sender);
     wxCFStringRef cf(wxCFRetain(filename));
     wxTheApp->MacOpenFile(cf.AsString()) ;
     return YES;
@@ -89,12 +91,14 @@ void wxMacWakeUp()
 
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
 {
+    wxUnusedVar(sender);
     wxTheApp->MacNewFile() ;
     return NO;
 }
 
 - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename
 {
+    wxUnusedVar(sender);
     wxCFStringRef cf(wxCFRetain(filename));
     wxTheApp->MacPrintFile(cf.AsString()) ;
     return YES;
@@ -109,6 +113,7 @@ void wxMacWakeUp()
 */
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
+    wxUnusedVar(sender);
     wxWindow* win = wxTheApp->GetTopWindow() ;
     if ( win )
     {
@@ -125,6 +130,8 @@ void wxMacWakeUp()
 
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
 {
+    wxUnusedVar(flag);
+    wxUnusedVar(sender);
     wxTheApp->MacReopenApp() ;
     return NO;
 }
@@ -132,6 +139,7 @@ void wxMacWakeUp()
 - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
     withReplyEvent:(NSAppleEventDescriptor *)replyEvent
 {
+    wxUnusedVar(replyEvent);
     NSString* url = [[event descriptorAtIndex:1] stringValue];
     wxCFStringRef cf(wxCFRetain(url));
     wxTheApp->MacOpenURL(cf.AsString()) ;
@@ -171,6 +179,7 @@ void wxMacWakeUp()
 
 - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
 {
+    wxUnusedVar(contextInfo);
     resultCode = returnCode;
     sheetFinished = YES;
     // NSAlerts don't need nor respond to orderOut
@@ -192,8 +201,8 @@ bool wxApp::DoInitGui()
         NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
         [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
             forEventClass:kInternetEventClass andEventID:kAEGetURL];
+        [NSApp finishLaunching];
     }
-    [NSApp finishLaunching];
     return true;
 }
 
@@ -268,14 +277,6 @@ bool wxIsBusy()
     return (gs_wxBusyCursorCount > 0);
 }
 
-void wxMacGlobalToLocal( WindowRef window , Point*pt )
-{
-}
-
-void wxMacLocalToGlobal( WindowRef window , Point*pt )
-{
-}
-
 wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
 {
     // wxScreenDC is derived from wxWindowDC, so a screen dc will
@@ -297,15 +298,22 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     // called from OnPaint, even with the window's paint dc as source (see wxHTMLWindow)
     NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
     [view unlockFocus];
+    
+    wxBitmap bitmap(width, height);
+    if ( [rep respondsToSelector:@selector(CGImage)] )
+    {
+        CGImageRef cgImageRef = (CGImageRef)[rep CGImage];
 
-    CGImageRef cgImageRef = (CGImageRef)[rep CGImage];
-
-    wxBitmap bitmap(CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
-    CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
-    // since our context is upside down we dont use CGContextDrawImage
-    wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
-    CGImageRelease(cgImageRef);
-    cgImageRef = NULL;
+        CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
+        // since our context is upside down we dont use CGContextDrawImage
+        wxMacDrawCGImage( (CGContextRef) bitmap.GetHBITMAP() , &r, cgImageRef ) ;
+        CGImageRelease(cgImageRef);
+        cgImageRef = NULL;
+    }
+    else
+    {
+        // TODO for 10.4 in case we can support this for osx_cocoa
+    }
     [rep release];
 
     return bitmap;