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 36ce2bb0d4fe99836b4f427ce55e8ad3c0555bd6..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


@@ -46,35 +45,6 @@ void wxBell()
     NSBeep();
 }
 
     NSBeep();
 }
 

-// ----------------------------------------------------------------------------
-// Common Event Support
-// ----------------------------------------------------------------------------
-
-void wxMacWakeUp()
-{
-    // ensure that we have an auto release pool in place because the event will
-    // be autoreleased from NSEvent:otherEventWithType and we might not have a
-    // global pool during startup or shutdown and we actually never have it if
-    // we're called from another thread
-    //
-    // FIXME: we can't use wxMacAutoreleasePool here because it's in core and
-    //        we're in base
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-    NSEvent* wakeupEvent = [NSEvent otherEventWithType:NSApplicationDefined
-                                    location:NSZeroPoint
-                                    modifierFlags:NSAnyEventMask
-                                    timestamp:0
-                                    windowNumber:0
-                                    context:nil
-                                    subtype:0
-                                    data1:0
-                                    data2:0];
-    [NSApp postEvent:wakeupEvent atStart:NO];
-
-    [pool release];
-}
-

 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI


@@ -83,22 +53,23 @@ void wxMacWakeUp()
 {
 }
 
 {
 }
 

-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+- (void)applicationWillFinishLaunching:(NSApplication *)sender;
+

 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
 - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
 - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;

-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;

 - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
 - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event

-    withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
+           withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
+- (void)applicationWillTerminate:(NSApplication *)sender;

 @end
 
 @implementation wxNSAppController
 
 @end
 
 @implementation wxNSAppController
 

-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
-{
-    wxUnusedVar(sender);
-    // let wx do this, not cocoa
-    return NO;
+- (void)applicationWillFinishLaunching:(NSApplication *)application {  
+    wxUnusedVar(application);

 }
 
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
 }
 
 - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;


@@ -124,6 +95,23 @@ void wxMacWakeUp()
     return YES;
 }
 
     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
 /*
     Allowable return values are:
         NSTerminateNow - it is ok to proceed with termination


@@ -134,36 +122,28 @@ void wxMacWakeUp()
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
     wxUnusedVar(sender);
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
     wxUnusedVar(sender);

-    wxWindow* win = wxTheApp->GetTopWindow() ;
-    if ( win )
-    {
-        wxCommandEvent exitEvent(wxEVT_COMMAND_MENU_SELECTED, wxApp::s_macExitMenuItemId);
-        if (!win->GetEventHandler()->ProcessEvent(exitEvent))
-            win->Close(true) ;
-    }
-    else
-    {
-         wxTheApp->ExitMainLoop() ;
-    }
-    return NSTerminateCancel;
+    wxCloseEvent event;
+    wxTheApp->OnQueryEndSession(event);
+    if ( event.GetVeto() )
+        return NSTerminateCancel;
+    
+    return NSTerminateNow;

 }
 
 }
 

-- (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
+- (void)applicationWillTerminate:(NSApplication *)application {
+    wxUnusedVar(application);
+    wxCloseEvent event;
+    event.SetCanVeto(false);
+    wxTheApp->OnEndSession(event);
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender

 {
 {

-    wxUnusedVar(flag);

     wxUnusedVar(sender);
     wxUnusedVar(sender);

-    wxTheApp->MacReopenApp() ;
+    // let wx do this, not cocoa

     return NO;
 }
 
     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()) ;
-}

 @end
 
 /*
 @end
 
 /*


@@ -176,9 +156,15 @@ void wxMacWakeUp()
     [super init];
     sheetFinished = NO;
     resultCode = -1;
     [super init];
     sheetFinished = NO;
     resultCode = -1;

+    impl = 0;

     return self;
 }
 
     return self;
 }
 

+- (void)setImplementation: (wxDialog *)dialog
+{
+    impl = dialog;
+}
+

 - (BOOL)finished
 {
     return sheetFinished;
 - (BOOL)finished
 {
     return sheetFinished;


@@ -205,6 +191,9 @@ void wxMacWakeUp()
     // NSAlerts don't need nor respond to orderOut
     if ([sheet respondsToSelector:@selector(orderOut:)])
         [sheet orderOut: self];
     // NSAlerts don't need nor respond to orderOut
     if ([sheet respondsToSelector:@selector(orderOut:)])
         [sheet orderOut: self];

+        
+    if (impl)
+        impl->ModalFinishedCallback(sheet, returnCode);

 }
 @end
 
 }
 @end
 


@@ -216,12 +205,17 @@ bool wxApp::DoInitGui()
     if (!sm_isEmbedded)
     {
         wxNSAppController* controller = [[wxNSAppController alloc] init];
     if (!sm_isEmbedded)
     {
         wxNSAppController* controller = [[wxNSAppController alloc] init];

-        [[NSApplication sharedApplication] setDelegate:controller];
+        [NSApp setDelegate:controller];

 
         NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
         [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
             forEventClass:kInternetEventClass andEventID:kAEGetURL];
 
         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];
         [NSApp finishLaunching];

+#endif

     }
     return true;
 }
     }
     return true;
 }