Correct format specifiers used to show wxIPV4address.

[wxWidgets.git] / src / osx / cocoa / utils.mm

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index c31e4e66c359b92eda20094cf9e66bd23a5070e2..e8d122f1710bb1c3858ff924c8ab02d86e8e0697 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -11,14 +11,13 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/wxprec.h"
-

 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
     #if wxUSE_GUI
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
     #if wxUSE_GUI

+        #include "wx/dialog.h"

         #include "wx/toplevel.h"
         #include "wx/font.h"
     #endif
         #include "wx/toplevel.h"
         #include "wx/font.h"
     #endif


@@ -31,6 +30,7 @@
 #if wxUSE_GUI
 #if wxOSX_USE_COCOA_OR_CARBON
     #include <CoreServices/CoreServices.h>
 #if wxUSE_GUI
 #if wxOSX_USE_COCOA_OR_CARBON
     #include <CoreServices/CoreServices.h>

+    #include "wx/osx/dcclient.h"

     #include "wx/osx/private/timer.h"
 #endif
 #endif // wxUSE_GUI
     #include "wx/osx/private/timer.h"
 #endif
 #endif // wxUSE_GUI


@@ -45,21 +45,178 @@ void wxBell()
     NSBeep();
 }
 
     NSBeep();
 }
 

-// ----------------------------------------------------------------------------
-// Common Event Support
-// ----------------------------------------------------------------------------
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI

 
 

-void wxMacWakeUp()
+@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)

 {
 {

-    // TODO

 }
 
 }
 

-#endif // wxUSE_BASE
- 
+- (void)applicationWillFinishLaunching:(NSApplication *)sender;
+
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
+- (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
+- (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
+           withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
+- (void)applicationWillTerminate:(NSApplication *)sender;
+@end
+
+@implementation wxNSAppController
+
+- (void)applicationWillFinishLaunching:(NSApplication *)application {  
+    wxUnusedVar(application);
+}
+
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
+{
+    wxUnusedVar(sender);
+    wxCFStringRef cf(wxCFRetain(filename));
+    wxTheApp->MacOpenFile(cf.AsString()) ;
+    return YES;
+}
+
+- (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;
+}
+
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
+{
+    wxUnusedVar(flag);
+    wxUnusedVar(sender);
+    wxTheApp->MacReopenApp() ;
+    return NO;
+}
+
+- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
+           withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+{
+    wxUnusedVar(replyEvent);
+    NSString* url = [[event descriptorAtIndex:1] stringValue];
+    wxCFStringRef cf(wxCFRetain(url));
+    wxTheApp->MacOpenURL(cf.AsString()) ;
+}
+
+/*
+    Allowable return values are:
+        NSTerminateNow - it is ok to proceed with termination
+        NSTerminateCancel - the application should not be terminated
+        NSTerminateLater - it may be ok to proceed with termination later.  The application must call -replyToApplicationShouldTerminate: with YES or NO once the answer is known
+            this return value is for delegates who need to provide document modal alerts (sheets) in order to decide whether to quit.
+*/
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+    wxUnusedVar(sender);
+    wxCloseEvent event;
+    wxTheApp->OnQueryEndSession(event);
+    if ( event.GetVeto() )
+        return NSTerminateCancel;
+    
+    return NSTerminateNow;
+}
+
+- (void)applicationWillTerminate:(NSApplication *)application {
+    wxUnusedVar(application);
+    wxCloseEvent event;
+    event.SetCanVeto(false);
+    wxTheApp->OnEndSession(event);
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
+{
+    wxUnusedVar(sender);
+    // let wx do this, not cocoa
+    return NO;
+}
+
+@end
+
+/*
+    allows ShowModal to work when using sheets.
+    see include/wx/osx/cocoa/private.h for more info
+*/
+@implementation ModalDialogDelegate
+- (id)init
+{
+    [super init];
+    sheetFinished = NO;
+    resultCode = -1;
+    impl = 0;
+    return self;
+}
+
+- (void)setImplementation: (wxDialog *)dialog
+{
+    impl = dialog;
+}
+
+- (BOOL)finished
+{
+    return sheetFinished;
+}
+
+- (int)code
+{
+    return resultCode;
+}
+
+- (void)waitForSheetToFinish
+{
+    while (!sheetFinished)
+    {
+        wxSafeYield();
+    }
+}
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+    wxUnusedVar(contextInfo);
+    resultCode = returnCode;
+    sheetFinished = YES;
+    // NSAlerts don't need nor respond to orderOut
+    if ([sheet respondsToSelector:@selector(orderOut:)])
+        [sheet orderOut: self];
+        
+    if (impl)
+        impl->ModalFinishedCallback(sheet, returnCode);
+}
+@end
+

 bool wxApp::DoInitGui()
 {
 bool wxApp::DoInitGui()
 {

+    wxMacAutoreleasePool pool;

     [NSApplication sharedApplication];
     [NSApplication sharedApplication];

-    [NSApp finishLaunching];
+
+    if (!sm_isEmbedded)
+    {
+        wxNSAppController* controller = [[wxNSAppController alloc] init];
+        [NSApp setDelegate:controller];
+
+        NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
+        [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
+            forEventClass:kInternetEventClass andEventID:kAEGetURL];
+   
+        // calling finishLaunching so early before running the loop seems to trigger some 'MenuManager compatibility' which leads
+        // to the duplication of menus under 10.5 and a warning under 10.6
+#if 0
+        [NSApp finishLaunching];
+#endif
+    }

     return true;
 }
 
     return true;
 }
 


@@ -67,8 +224,6 @@ void wxApp::DoCleanUp()
 {
 }
 
 {
 }
 

-#if wxUSE_GUI
-

 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     NSRect displayRect = [[NSScreen mainScreen] visibleFrame];
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     NSRect displayRect = [[NSScreen mainScreen] visibleFrame];


@@ -81,14 +236,46 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
         *width = r.GetWidth();
     if ( height )
         *height = r.GetHeight();
         *width = r.GetWidth();
     if ( height )
         *height = r.GetHeight();

-    
+

 }
 
 void wxGetMousePosition( int* x, int* y )
 {
     wxPoint pt = wxFromNSPoint(NULL, [NSEvent mouseLocation]);
 }
 
 void wxGetMousePosition( int* x, int* y )
 {
     wxPoint pt = wxFromNSPoint(NULL, [NSEvent mouseLocation]);

+    if ( x )
+        *x = pt.x;
+    if ( y )
+        *y = pt.y;

 };
 
 };
 

+#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
+
+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    
+    wxPoint pt = wxGetMousePosition();
+    ms.SetX(pt.x);
+    ms.SetY(pt.y);
+    
+    NSUInteger modifiers = [NSEvent modifierFlags];
+    NSUInteger buttons = [NSEvent pressedMouseButtons];
+    
+    ms.SetLeftDown( (buttons & 0x01) != 0 );
+    ms.SetMiddleDown( (buttons & 0x04) != 0 );
+    ms.SetRightDown( (buttons & 0x02) != 0 );
+    
+    ms.SetControlDown(modifiers & NSControlKeyMask);
+    ms.SetShiftDown(modifiers & NSShiftKeyMask);
+    ms.SetAltDown(modifiers & NSAlternateKeyMask);
+    ms.SetMetaDown(modifiers & NSCommandKeyMask);
+    
+    return ms;
+}
+
+
+#endif
+

 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);


@@ -132,16 +319,48 @@ bool wxIsBusy()
     return (gs_wxBusyCursorCount > 0);
 }
 
     return (gs_wxBusyCursorCount > 0);
 }
 

-void wxMacGlobalToLocal( WindowRef window , Point*pt )
+wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const

 {
 {

-}
+    // wxScreenDC is derived from wxWindowDC, so a screen dc will
+    // call this method when a Blit is performed with it as a source.
+    if (!m_window)
+        return wxNullBitmap;

 
 

-void wxMacLocalToGlobal( WindowRef window , Point*pt )
-{
-}
+    wxSize sz = m_window->GetSize();

 
 

-#endif // wxUSE_GUI
+    int left = subrect != NULL ? subrect->x : 0 ;
+    int top = subrect != NULL ? subrect->y : 0 ;
+    int width = subrect != NULL ? subrect->width : sz.x;
+    int height = subrect !=  NULL ? subrect->height : sz.y ;
+
+    NSRect rect = NSMakeRect(left, top, width, height );
+    NSView* view = (NSView*) m_window->GetHandle();
+    [view lockFocus];
+    // we use this method as other methods force a repaint, and this method can be
+    // 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];

 
 

+        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;
+}
+
+#endif // wxUSE_GUI

 
 

-#endif // wxOSX_USE_COCOA
\ No newline at end of file
+#endif // wxOSX_USE_COCOA