Don't show focus rectangle if wxNO_BORDER specified

[wxWidgets.git] / src / cocoa / app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index 3fcbd3b162f54a47545802463fcb4255efdec7e1..f8f064934f73bb861a6af0ffce3bc8e72fdf0c55 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -6,15 +6,13 @@
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) David Elliott
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Copyright:   (c) David Elliott

-// Licence:     wxWindows licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/app.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/app.h"

-    #include "wx/frame.h"
-    #include "wx/dialog.h"

     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"


@@ -33,11 +31,11 @@
 
 #import <AppKit/NSApplication.h>
 #import <Foundation/NSRunLoop.h>
 
 #import <AppKit/NSApplication.h>
 #import <Foundation/NSRunLoop.h>

-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>

 #import <Foundation/NSThread.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSThread.h>
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSString.h>

+#import <Foundation/NSNotification.h>
+#import <AppKit/NSCell.h>

 
 // ========================================================================
 // wxPoseAsInitializer
 
 // ========================================================================
 // wxPoseAsInitializer


@@ -123,7 +121,7 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 @implementation wxNSApplicationDelegate : NSObject
 
 // NOTE: Terminate means that the event loop does NOT return and thus
 @implementation wxNSApplicationDelegate : NSObject
 
 // NOTE: Terminate means that the event loop does NOT return and thus

-// cleanup code doesn't properly execute.  Furthermore, wxWindows has its
+// cleanup code doesn't properly execute.  Furthermore, wxWidgets has its

 // own exit on frame delete mechanism.
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
 {
 // own exit on frame delete mechanism.
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
 {


@@ -150,6 +148,11 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
     wxTheApp->CocoaDelegate_applicationDidResignActive();
 }
 
     wxTheApp->CocoaDelegate_applicationDidResignActive();
 }
 

+- (void)controlTintChanged:(NSNotification *)notification
+{
+    wxLogDebug("TODO: send EVT_SYS_COLOUR_CHANGED as appropriate");
+}
+

 @end // implementation wxNSApplicationDelegate : NSObject
 
 // ========================================================================
 @end // implementation wxNSApplicationDelegate : NSObject
 
 // ========================================================================


@@ -203,6 +206,8 @@ void wxApp::CleanUp()
     wxMenuBarManager::DestroyInstance();
 
     [m_cocoaApp setDelegate:nil];
     wxMenuBarManager::DestroyInstance();
 
     [m_cocoaApp setDelegate:nil];

+    [[NSNotificationCenter defaultCenter] removeObserver:m_cocoaAppDelegate
+        name:NSControlTintDidChangeNotification object:nil];

     [m_cocoaAppDelegate release];
     m_cocoaAppDelegate = NULL;
 
     [m_cocoaAppDelegate release];
     m_cocoaAppDelegate = NULL;
 


@@ -256,11 +261,13 @@ bool wxApp::OnInitGui()
     m_cocoaApp = [NSApplication sharedApplication];
     m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init];
     [m_cocoaApp setDelegate:m_cocoaAppDelegate];
     m_cocoaApp = [NSApplication sharedApplication];
     m_cocoaAppDelegate = [[wxNSApplicationDelegate alloc] init];
     [m_cocoaApp setDelegate:m_cocoaAppDelegate];

+    [[NSNotificationCenter defaultCenter] addObserver:m_cocoaAppDelegate
+        selector:@selector(controlTintChanged:)
+        name:NSControlTintDidChangeNotification object:nil];

 
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();
 
     wxMenuBarManager::CreateInstance();
 
     wxDC::CocoaInitializeTextSystem();

-//    [ m_cocoaApp setDelegate:m_cocoaApp ];

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -310,12 +317,16 @@ bool wxApp::Yield(bool onlyIfNeeded)
     s_inYield = true;
 
     // Run the event loop until it is out of events
     s_inYield = true;
 
     // Run the event loop until it is out of events

-    while(NSEvent *event = [GetNSApplication()
+    while(1)
+    {
+        wxAutoNSAutoreleasePool pool;
+        NSEvent *event = [GetNSApplication()

                 nextEventMatchingMask:NSAnyEventMask
                 nextEventMatchingMask:NSAnyEventMask

-                untilDate:[NSDate distantPast]
+                untilDate:nil /* ==[NSDate distantPast] */

                 inMode:NSDefaultRunLoopMode
                 inMode:NSDefaultRunLoopMode

-                dequeue: YES])
-    {
+                dequeue: YES];
+        if(!event)
+            break;

         [GetNSApplication() sendEvent: event];
     }
 
         [GetNSApplication() sendEvent: event];
     }