The alignment controls are now left-aligned if the floating controls are not shown.

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 66bf2fb6828e04ff0a8c0f6d0f8a9199a6507b10..f0d6a398d05e90813c2b1780a8deb08667635073 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -47,7 +46,8 @@ void wxBell()
 
 @implementation wxNSAppController
 
 
 @implementation wxNSAppController
 

-- (void)applicationWillFinishLaunching:(NSNotification *)application { 
+- (void)applicationWillFinishLaunching:(NSNotification *)application
+{

     wxUnusedVar(application);
     
     // we must install our handlers later than setting the app delegate, because otherwise our handlers
     wxUnusedVar(application);
     
     // we must install our handlers later than setting the app delegate, because otherwise our handlers


@@ -61,6 +61,12 @@ void wxBell()
     [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:)
                          forEventClass:kCoreEventClass andEventID:kAEOpenApplication];
     
     [appleEventManager setEventHandler:self andSelector:@selector(handleOpenAppEvent:withReplyEvent:)
                          forEventClass:kCoreEventClass andEventID:kAEOpenApplication];
     

+    wxTheApp->OSXOnWillFinishLaunching();
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    wxTheApp->OSXOnDidFinishLaunching();

 }
 
 - (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames
 }
 
 - (void)application:(NSApplication *)sender openFiles:(NSArray *)fileNames


@@ -119,9 +125,7 @@ void wxBell()
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
     wxUnusedVar(sender);
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
     wxUnusedVar(sender);

-    wxCloseEvent event;
-    wxTheApp->OnQueryEndSession(event);
-    if ( event.GetVeto() )
+    if ( !wxTheApp->OSXOnShouldTerminate() )

         return NSTerminateCancel;
     
     return NSTerminateNow;
         return NSTerminateCancel;
     
     return NSTerminateNow;


@@ -129,9 +133,7 @@ void wxBell()
 
 - (void)applicationWillTerminate:(NSNotification *)application {
     wxUnusedVar(application);
 
 - (void)applicationWillTerminate:(NSNotification *)application {
     wxUnusedVar(application);

-    wxCloseEvent event;
-    event.SetCanVeto(false);
-    wxTheApp->OnEndSession(event);
+    wxTheApp->OSXOnWillTerminate();

 }
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 }
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender


@@ -240,21 +242,39 @@ void wxBell()
 // here we subclass NSApplication, for the purpose of being able to override sendEvent.
 @interface wxNSApplication : NSApplication
 {
 // here we subclass NSApplication, for the purpose of being able to override sendEvent.
 @interface wxNSApplication : NSApplication
 {

+    BOOL firstPass;

 }
 
 }
 

+- (id)init;
+

 - (void)sendEvent:(NSEvent *)anEvent;
 
 @end
 
 @implementation wxNSApplication
 
 - (void)sendEvent:(NSEvent *)anEvent;
 
 @end
 
 @implementation wxNSApplication
 

+- (id)init
+{
+    self = [super init];
+    firstPass = YES;
+    return self;
+}
+

 /* This is needed because otherwise we don't receive any key-up events for command-key
  combinations (an AppKit bug, apparently)                      */
 - (void)sendEvent:(NSEvent *)anEvent
 {
     if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
         [[self keyWindow] sendEvent:anEvent];
 /* This is needed because otherwise we don't receive any key-up events for command-key
  combinations (an AppKit bug, apparently)                      */
 - (void)sendEvent:(NSEvent *)anEvent
 {
     if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
         [[self keyWindow] sendEvent:anEvent];

-    else [super sendEvent:anEvent];
+    else
+        [super sendEvent:anEvent];
+    
+    if ( firstPass )
+    {
+        [NSApp stop:nil];
+        firstPass = NO;
+        return;
+    }

 }
 
 @end
 }
 
 @end


@@ -291,6 +311,14 @@ bool wxApp::DoInitGui()
     return true;
 }
 
     return true;
 }
 

+bool wxApp::CallOnInit()
+{
+    wxMacAutoreleasePool autoreleasepool;
+    // this will only run one cycle to make sure the OS is ready
+    [NSApp run];
+    return OnInit();
+}
+

 void wxApp::DoCleanUp()
 {
     if ( appcontroller != nil )
 void wxApp::DoCleanUp()
 {
     if ( appcontroller != nil )