// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include "wx/module.h"
#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/mbarman.h"
#if wxUSE_WX_RESOURCES
# include "wx/resource.h"
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSArray.h>
#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSThread.h>
+#import <AppKit/NSEvent.h>
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
+// ========================================================================
+// wxPoseAsInitializer
+// ========================================================================
wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL;
+// ========================================================================
+// wxPoserNSApplication
+// ========================================================================
@interface wxPoserNSApplication : NSApplication
{
}
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
@end // wxPoserNSApplication
+WX_IMPLEMENT_POSER(wxPoserNSApplication);
+
@implementation wxPoserNSApplication : NSApplication
- (void)doIdle: (id)data
{
wxASSERT(wxTheApp);
+ wxASSERT(wxMenuBarManager::GetInstance());
+ wxMenuBarManager::GetInstance()->CocoaInternalIdle();
wxLogDebug("doIdle called");
- NSRunLoop *rl = [NSRunLoop currentRunLoop];
- // runMode: beforeDate returns YES if something was done
- while(wxTheApp->ProcessIdle()) // FIXME: AND NO EVENTS ARE PENDING
+#ifdef __WXDEBUG__
+ if(wxTheApp->IsInAssert())
+ {
+ wxLogDebug("Idle events ignored durring assertion dialog");
+ }
+ else
+#endif
{
- wxLogDebug("Looping for idle events");
- #if 1
- if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]])
+ NSRunLoop *rl = [NSRunLoop currentRunLoop];
+ // runMode: beforeDate returns YES if something was done
+ while(wxTheApp->ProcessIdle()) // FIXME: AND NO EVENTS ARE PENDING
{
- wxLogDebug("Found actual work to do");
- break;
+ wxLogDebug("Looping for idle events");
+ #if 1
+ if( [rl runMode:[rl currentMode] beforeDate:[NSDate distantPast]])
+ {
+ wxLogDebug("Found actual work to do");
+ break;
+ }
+ #endif
}
- #endif
}
wxLogDebug("Idle processing complete, requesting next idle event");
// Add ourself back into the run loop (on next event) if necessary
}
@end // wxPoserNSApplication
-WX_IMPLEMENT_POSER(wxPoserNSApplication);
-
-class wxAutoNSAutoreleasePool
-{
-public:
- wxAutoNSAutoreleasePool()
- {
- m_pool = [[NSAutoreleasePool alloc] init];
- }
- ~wxAutoNSAutoreleasePool()
- {
- [m_pool release];
- }
-protected:
- NSAutoreleasePool *m_pool;
-};
-
-// ============================================================================
-// functions
-// ============================================================================
-
-void wxApp::Exit()
-{
- wxApp::CleanUp();
- wxAppConsole::Exit();
-}
-
-// ============================================================================
-// wxApp implementation
-// ============================================================================
+// ========================================================================
+// wxApp
+// ========================================================================
// ----------------------------------------------------------------------------
// wxApp Static member initialization
// ----------------------------------------------------------------------------
-
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
+ EVT_IDLE(wxAppBase::OnIdle)
// EVT_END_SESSION(wxApp::OnEndSession)
// EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
END_EVENT_TABLE()
-#endif
// ----------------------------------------------------------------------------
// wxApp initialization/cleanup
// ----------------------------------------------------------------------------
-
bool wxApp::Initialize(int& argc, wxChar **argv)
{
wxAutoNSAutoreleasePool pool;
+ m_cocoaMainThread = [NSThread currentThread];
// Mac OS X passes a process serial number command line argument when
// the application is launched from the Finder. This argument must be
// removed from the command line arguments before being handled by the
void wxApp::CleanUp()
{
wxDC::CocoaShutdownTextSystem();
+ wxMenuBarManager::DestroyInstance();
wxAppBase::CleanUp();
}
// ----------------------------------------------------------------------------
// wxApp creation
// ----------------------------------------------------------------------------
-
wxApp::wxApp()
{
m_topWindow = NULL;
- wxTheApp = this;
m_isIdle = true;
#if WXWIN_COMPATIBILITY_2_2
m_wantDebugOutput = TRUE;
#endif
+#ifdef __WXDEBUG__
+ m_isInAssert = FALSE;
+#endif // __WXDEBUG__
argc = 0;
argv = 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;
// Create the app using the sharedApplication method
m_cocoaApp = [NSApplication sharedApplication];
+
+ wxMenuBarManager::CreateInstance();
+
wxDC::CocoaInitializeTextSystem();
// [ m_cocoaApp setDelegate:m_cocoaApp ];
#if 0
bool wxApp::CallOnInit()
{
- wxAutoNSAutoreleasePool pool;
+// wxAutoNSAutoreleasePool pool;
return OnInit();
}
return TRUE;
}
-bool wxApp::Initialized()
+void wxApp::Exit()
{
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
+ wxApp::CleanUp();
+
+ wxAppConsole::Exit();
}
int wxApp::MainLoop()
}
// Dispatch a message.
-void wxApp::Dispatch()
-{
-}
-
-void wxApp::OnIdle(wxIdleEvent& event)
+bool wxApp::Dispatch()
{
- wxLogDebug("wxApp::OnIdle");
-#if 0
- static bool s_inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if ( s_inOnIdle )
- return;
- s_inOnIdle = TRUE;
-#endif
-
-
- DeletePendingObjects();
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
-#if 0
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-
- if (needMore)
- event.RequestMore(TRUE);
-
- s_inOnIdle = FALSE;
-#endif
+ return true;
}
// Yield to other processes
-
bool wxApp::Yield(bool onlyIfNeeded)
{
// MT-FIXME
s_inYield = true;
- wxLogDebug("WARNING: SUPPOSED to have yielded!");
- // FIXME: Do something!
+ // Run the event loop until it is out of events
+ while(NSEvent *event = [GetNSApplication()
+ nextEventMatchingMask:NSAnyEventMask
+ untilDate:[NSDate distantPast]
+ inMode:NSDefaultRunLoopMode
+ dequeue: YES])
+ {
+ [GetNSApplication() sendEvent: event];
+ }
#if wxUSE_LOG
// let the logs be flashed again
return true;
}
+#ifdef __WXDEBUG__
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
+{
+ m_isInAssert = TRUE;
+ wxAppBase::OnAssert(file, line, cond, msg);
+ m_isInAssert = FALSE;
+}
+#endif // __WXDEBUG__
+
projects / wxWidgets.git / blobdiff