use the window default colours, not hardcoded ones, in OnSysColourChanged()

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

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index d1676de387cba9a4505013c577f50bf06c30cfcb..ee8284346b26cfd5cbc51d4a2ba5cc792e695d70 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -13,8 +13,6 @@
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
     #include "wx/app.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"


@@ -25,6 +23,7 @@
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/mbarman.h"
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/mbarman.h"

+#include "wx/cocoa/NSApplication.h"

 
 #if wxUSE_WX_RESOURCES
 #  include "wx/resource.h"
 
 #if wxUSE_WX_RESOURCES
 #  include "wx/resource.h"


@@ -32,16 +31,17 @@
 
 #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/NSThread.h>
 #import <AppKit/NSEvent.h>

+#import <Foundation/NSString.h>

 
 // ========================================================================
 // wxPoseAsInitializer
 // ========================================================================
 wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 
 
 // ========================================================================
 // wxPoseAsInitializer
 // ========================================================================
 wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 

+static bool sg_needIdle = true;
+

 // ========================================================================
 // wxPoserNSApplication
 // ========================================================================
 // ========================================================================
 // wxPoserNSApplication
 // ========================================================================


@@ -49,6 +49,7 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
 {
 }
 
 {
 }
 

+- (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag;

 - (void)sendEvent: (NSEvent*)anEvent;
 @end // wxPoserNSApplication
 
 - (void)sendEvent: (NSEvent*)anEvent;
 @end // wxPoserNSApplication
 


@@ -56,10 +57,57 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 
 @implementation wxPoserNSApplication : NSApplication
 
 
 @implementation wxPoserNSApplication : NSApplication
 

+/* NOTE: The old method of idle event handling added the handler using the
+    [NSRunLoop -performSelector:target:argument:order:modes] which caused
+    the invocation to occur at the begining of [NSApplication
+    -nextEventMatchingMask:untilDate:expiration:inMode:dequeue:].  However,
+    the code would be scheduled for invocation with every iteration of
+    the event loop.  This new method simply overrides the method.  The
+    same caveats apply.  In particular, by the time the event loop has
+    called this method, it usually expects to receive an event.  If you
+    plan on stopping the event loop, it is wise to send an event through
+    the queue to ensure this method will return.
+    See wxEventLoop::Exit() for more information.
+*/
+   
+- (NSEvent *)nextEventMatchingMask:(unsigned int)mask untilDate:(NSDate *)expiration inMode:(NSString *)mode dequeue:(BOOL)flag
+{
+    // Get the same events except don't block
+    NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+    // If we got one, simply return it
+    if(event)
+        return event;
+    // No events, try doing some idle stuff
+    if(sg_needIdle
+#ifdef __WXDEBUG__
+        && !wxTheApp->IsInAssert()
+#endif
+        && ([NSDefaultRunLoopMode isEqualToString:mode] || [NSModalPanelRunLoopMode isEqualToString:mode]))
+    {
+        sg_needIdle = false;
+        wxLogTrace(wxTRACE_COCOA,wxT("Processing idle events"));
+        while(wxTheApp->ProcessIdle())
+        {
+            // Get the same events except don't block
+            NSEvent *event = [super nextEventMatchingMask:mask untilDate:nil/* equivalent to [NSDate distantPast] */ inMode:mode dequeue:flag];
+            // If we got one, simply return it
+            if(event)
+                return event;
+            // we didn't get one, do some idle work
+            wxLogTrace(wxTRACE_COCOA,wxT("Looping idle events"));
+        }
+        // No more idle work requested, block
+        wxLogTrace(wxTRACE_COCOA,wxT("Finished idle processing"));
+    }
+    else
+        wxLogTrace(wxTRACE_COCOA,wxT("Avoiding idle processing sg_needIdle=%d"),sg_needIdle);
+    return [super nextEventMatchingMask:mask untilDate:expiration inMode:mode dequeue:flag];
+}
+

 - (void)sendEvent: (NSEvent*)anEvent
 {
 - (void)sendEvent: (NSEvent*)anEvent
 {

-    wxLogDebug("SendEvent");
-    wxTheApp->CocoaInstallRequestedIdleHandler();
+    wxLogTrace(wxTRACE_COCOA,wxT("SendEvent"));
+    sg_needIdle = true;

     [super sendEvent: anEvent];
 }
 
     [super sendEvent: anEvent];
 }
 


@@ -68,53 +116,8 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 // ========================================================================
 // wxNSApplicationDelegate
 // ========================================================================
 // ========================================================================
 // wxNSApplicationDelegate
 // ========================================================================

-@interface wxNSApplicationDelegate : NSObject
-{
-}
-
-- (void)doIdle: (id)data;
-// Delegate methods
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-- (void)applicationWillBecomeActive:(NSNotification *)notification;
-- (void)applicationDidBecomeActive:(NSNotification *)notification;
-- (void)applicationWillResignActive:(NSNotification *)notification;
-- (void)applicationDidResignActive:(NSNotification *)notification;
-@end // interface wxNSApplicationDelegate : NSObject
-

 @implementation wxNSApplicationDelegate : NSObject
 
 @implementation wxNSApplicationDelegate : NSObject
 

-- (void)doIdle: (id)data
-{
-    wxASSERT(wxTheApp);
-    wxASSERT(wxMenuBarManager::GetInstance());
-    wxLogDebug("doIdle called");
-#ifdef __WXDEBUG__
-    if(wxTheApp->IsInAssert())
-    {
-        wxLogDebug("Idle events ignored durring assertion dialog");
-    }
-    else
-#endif
-    {
-        NSRunLoop *rl = [NSRunLoop currentRunLoop];
-        // runMode: beforeDate returns YES if something was done
-        while(wxTheApp->ProcessIdle()) // FIXME: AND NO EVENTS ARE PENDING
-        {
-            wxLogDebug("Looping for idle events");
-            #if 1
-            if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]])
-            {
-                wxLogDebug("Found actual work to do");
-                break;
-            }
-            #endif
-        }
-    }
-    wxLogDebug("Idle processing complete, requesting next idle event");
-    // Add ourself back into the run loop (on next event) if necessary
-    wxTheApp->CocoaRequestIdle();
-}
-

 // NOTE: Terminate means that the event loop does NOT return and thus
 // cleanup code doesn't properly execute.  Furthermore, wxWindows has its
 // own exit on frame delete mechanism.
 // NOTE: Terminate means that the event loop does NOT return and thus
 // cleanup code doesn't properly execute.  Furthermore, wxWindows has its
 // own exit on frame delete mechanism.


@@ -173,11 +176,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");

-        if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
+        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )

         {
             // remove this argument
             --argc;
         {
             // remove this argument
             --argc;

-            memmove(argv + 1, argv + 2, argc * sizeof(char *));
+            memmove(argv + 1, argv + 2, argc * sizeof(wxChar *));

         }
     }
 
         }
     }
 


@@ -209,7 +212,6 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
 
 {
     m_topWindow = NULL;
 

-    m_isIdle = true;

 #if WXWIN_COMPATIBILITY_2_2
     m_wantDebugOutput = TRUE;
 #endif
 #if WXWIN_COMPATIBILITY_2_2
     m_wantDebugOutput = TRUE;
 #endif


@@ -223,34 +225,6 @@ wxApp::wxApp()
     m_cocoaAppDelegate = NULL;
 }
 
     m_cocoaAppDelegate = NULL;
 }
 

-void wxApp::CocoaInstallIdleHandler()
-{
-    // If we're not the main thread, don't install the idle handler
-    if(m_cocoaMainThread != [NSThread currentThread])
-    {
-        wxLogDebug("Attempt to install idle handler from secondary thread");
-        return;
-    }
-    // If we're supposed to be stopping, don't add more idle events
-    if(![m_cocoaApp isRunning])
-        return;
-    wxLogDebug("wxApp::CocoaInstallIdleHandler");
-    m_isIdle = false;
-    // Call doIdle for EVERYTHING dammit
-// We'd need Foundation/NSConnection.h for this next constant, do we need it?
-    [[ NSRunLoop currentRunLoop ] performSelector:@selector(doIdle:) target:m_cocoaAppDelegate argument:NULL order:0 modes:[NSArray arrayWithObjects:NSDefaultRunLoopMode, /* NSConnectionReplyRunLoopMode,*/ NSModalPanelRunLoopMode, /**/NSEventTrackingRunLoopMode,/**/ nil] ];
-    /* Notes:
-    In the Mac OS X implementation of Cocoa, the above method schedules
-    doIdle: to be called from *within* [NSApplication
-    -nextEventMatchingMask:untilDate:inMode:dequeue:].  That is, no
-    NSEvent object is generated and control does not return from that
-    method.  In fact, control will only return from that method for the
-    usual reasons (e.g. a real event is received or the untilDate is reached).
-    This has implications when trying to stop the event loop and return to
-    its caller.  See wxEventLoop::Exit
-    */
-}
-

 void wxApp::CocoaDelegate_applicationWillBecomeActive()
 {
 }
 void wxApp::CocoaDelegate_applicationWillBecomeActive()
 {
 }


@@ -261,6 +235,7 @@ void wxApp::CocoaDelegate_applicationDidBecomeActive()
 
 void wxApp::CocoaDelegate_applicationWillResignActive()
 {
 
 void wxApp::CocoaDelegate_applicationWillResignActive()
 {

+    wxTopLevelWindowCocoa::DeactivatePendingWindow();

 }
 
 void wxApp::CocoaDelegate_applicationDidResignActive()
 }
 
 void wxApp::CocoaDelegate_applicationDidResignActive()


@@ -282,11 +257,6 @@ bool wxApp::OnInitGui()
 
     wxDC::CocoaInitializeTextSystem();
 //    [ m_cocoaApp setDelegate:m_cocoaApp ];
 
     wxDC::CocoaInitializeTextSystem();
 //    [ m_cocoaApp setDelegate:m_cocoaApp ];

-    #if 0
-    wxLogDebug("Just for kicks");
-    [ m_cocoaAppDelegate performSelector:@selector(doIdle:) withObject:NULL ];
-    wxLogDebug("okay.. done now");
-    #endif

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -355,6 +325,14 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return true;
 }
 
     return true;
 }
 

+void wxApp::WakeUpIdle()
+{
+    [m_cocoaApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
+            location:NSZeroPoint modifierFlags:NSAnyEventMask
+            timestamp:0 windowNumber:0 context:nil
+            subtype:0 data1:0 data2:0] atStart:NO];
+}
+

 #ifdef __WXDEBUG__
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
 #ifdef __WXDEBUG__
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {