// Author: David Elliott
// Modified by:
// Created: 2002/11/27
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) David Elliott
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/module.h"
#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/autorelease.h"
#if wxUSE_WX_RESOURCES
# include "wx/resource.h"
#import <AppKit/NSApplication.h>
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
// ----------------------------------------------------------------------------
// globals
}
- (void)doIdle: (id)data;
-- (void)finishLaunching;
- (void)sendEvent: (NSEvent*)anEvent;
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
@end // wxPoserNSApplication
wxTheApp->CocoaRequestIdle();
}
-- (void)finishLaunching
-{
- wxLogDebug("finishLaunching");
- bool initsuccess = wxTheApp->OnInit();
- if(!initsuccess)
- [super stop: NULL];
-
- [super finishLaunching];
-}
-
- (void)sendEvent: (NSEvent*)anEvent
{
wxLogDebug("SendEvent");
#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()
bool wxApp::Initialize(int& argc, wxChar **argv)
{
+ wxAutoNSAutoreleasePool pool;
// 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
}
}
- // VZ: apparently this needs to be done a.s.a.p., right? it is done after
- // wxClassInfo::InitializeClasses() now but usd to be done before, I
- // hope it's not a problem -- if it is, please let me know, David (if
- // it isn't, just remove this comment :-)
+ // Posing must be completed before any instances of the Objective-C
+ // classes being posed as are created.
wxPoseAsInitializer::InitializePosers();
return wxAppBase::Initialize(argc, argv);
void wxApp::CocoaInstallIdleHandler()
{
+ // 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
bool wxApp::OnInitGui()
{
+ wxAutoNSAutoreleasePool pool;
if(!wxAppBase::OnInitGui())
return FALSE;
return TRUE;
}
+bool wxApp::CallOnInit()
+{
+// wxAutoNSAutoreleasePool pool;
+ return OnInit();
+}
+
bool wxApp::OnInit()
{
if(!wxAppBase::OnInit())
return 0;
}
-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
- event.SetEventObject(this);
- ProcessEvent(event);
-
- return event.MoreRequested();
-}
-
void wxApp::ExitMainLoop()
{
wxLogDebug("wxApp::ExitMailLoop m_isIdle=%d, isRunning=%d",(int)m_isIdle,(int)[m_cocoaApp isRunning]);
if(!m_isIdle)
[[ NSRunLoop currentRunLoop ] cancelPerformSelector:@selector(doIdle:) target:m_cocoaApp argument:NULL];
#endif
- [m_cocoaApp terminate: m_cocoaApp];
+ [m_cocoaApp stop: m_cocoaApp];
}
// Is a message/event pending?
{
}
-void wxApp::OnIdle(wxIdleEvent& event)
-{
- wxLogDebug("wxApp::OnIdle");
- static bool s_inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if ( s_inOnIdle )
- return;
- s_inOnIdle = TRUE;
-
-
- DeletePendingObjects();
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-
- if (needMore)
- event.RequestMore(TRUE);
-
- s_inOnIdle = FALSE;
-}
-
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
- bool needMore = FALSE;
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->GetNext();
- }
- return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-// wxLogDebug("SendIdleEvents win=%p",win);
- bool needMore = FALSE;
-
- wxIdleEvent event;
- event.SetEventObject(win);
- win->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxWindowList::Node* node = win->GetChildren().GetFirst();
- while (node)
- {
-// wxLogDebug("child=%p",node->Data());
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->GetNext();
- }
- return needMore;
-}
-
// Yield to other processes
bool wxApp::Yield(bool onlyIfNeeded)