X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9482617091b084d4ee006679a450176715d465e0..68d4172048cfc0f3e658ef90ff5af926eedfdd57:/src/cocoa/app.mm?ds=sidebyside diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index 8532a12f94..89c16115f3 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -4,9 +4,9 @@ // 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 ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -39,6 +39,7 @@ #import #import #import +#import // ---------------------------------------------------------------------------- // globals @@ -51,7 +52,6 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; } - (void)doIdle: (id)data; -- (void)finishLaunching; - (void)sendEvent: (NSEvent*)anEvent; - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication; @end // wxPoserNSApplication @@ -80,16 +80,6 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; wxTheApp->CocoaRequestIdle(); } -- (void)finishLaunching -{ - wxLogDebug("finishLaunching"); - bool initsuccess = wxTheApp->OnInit(); - if(!initsuccess) - [super stop: NULL]; - - [super finishLaunching]; -} - - (void)sendEvent: (NSEvent*)anEvent { wxLogDebug("SendEvent"); @@ -107,102 +97,24 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; @end // wxPoserNSApplication WX_IMPLEMENT_POSER(wxPoserNSApplication); -// ============================================================================ -// functions -// ============================================================================ - -//---------------------------------------------------------------------- -// wxEntry -//---------------------------------------------------------------------- - -int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char *WXUNUSED(argv)[] ) -{ - return wxApp::Initialize(); -} - -int WXDLLEXPORT wxEntryInitGui() -{ - return wxTheApp->OnInitGui(); -} - -void WXDLLEXPORT wxEntryCleanup() +class wxAutoNSAutoreleasePool { - wxApp::CleanUp(); -} - -int wxEntry( int argc, char *argv[]) -{ - if (!wxEntryStart(argc, argv)) { - return 0; - } - wxLogDebug("Creating application"); - // create the application object or ensure that one already exists - if (!wxTheApp) +public: + wxAutoNSAutoreleasePool() { - // The app may have declared a global application object, but we recommend - // the IMPLEMENT_APP macro is used instead, which sets an initializer - // function for delayed, dynamic app object construction. - wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, - wxT("No initializer - use IMPLEMENT_APP macro.") ); - - wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) (); + m_pool = [[NSAutoreleasePool alloc] init]; } - - wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); - - // 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 - // application (otherwise applications would need to handle it) - - if (argc > 1) { - char theArg[6] = ""; - strncpy(theArg, argv[1], 5); - - if (strcmp(theArg, "-psn_") == 0) { - // assume the argument is always the only one and remove it - --argc; - } - } - - wxTheApp->argc = argc; - wxTheApp->argv = argv; - - wxLogDebug("initializing gui"); - // GUI-specific initialization, such as creating an app context. - wxEntryInitGui(); - - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - int retValue = 0; - - wxLogDebug("Time to run"); - retValue = wxTheApp->OnRun(); - - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if ( topWindow ) + ~wxAutoNSAutoreleasePool() { - // Forcibly delete the window. - if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - topWindow->Close(TRUE); - } - else - { - delete topWindow; - wxTheApp->SetTopWindow(NULL); - } + [m_pool release]; } +protected: + NSAutoreleasePool *m_pool; +}; - wxTheApp->OnExit(); - - wxEntryCleanup(); - - return retValue; -} +// ============================================================================ +// functions +// ============================================================================ void wxApp::Exit() { @@ -229,15 +141,28 @@ END_EVENT_TABLE() #endif // ---------------------------------------------------------------------------- -// wxApp static functions +// wxApp initialization/cleanup // ---------------------------------------------------------------------------- -bool wxApp::Initialize(int argc, wxChar **argv) +bool wxApp::Initialize(int& argc, wxChar **argv) { - // 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 :-) + 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 + // application (otherwise applications would need to handle it) + if ( argc > 1 ) + { + static const wxChar *ARG_PSN = _T("-psn_"); + if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 ) + { + // remove this argument + memmove(argv, argv + 1, argc--); + } + } + + // Posing must be completed before any instances of the Objective-C + // classes being posed as are created. wxPoseAsInitializer::InitializePosers(); return wxAppBase::Initialize(argc, argv); @@ -280,6 +205,7 @@ void wxApp::CocoaInstallIdleHandler() bool wxApp::OnInitGui() { + wxAutoNSAutoreleasePool pool; if(!wxAppBase::OnInitGui()) return FALSE; @@ -295,6 +221,12 @@ bool wxApp::OnInitGui() return TRUE; } +bool wxApp::CallOnInit() +{ + wxAutoNSAutoreleasePool pool; + return OnInit(); +} + bool wxApp::OnInit() { if(!wxAppBase::OnInit()) @@ -317,16 +249,6 @@ int wxApp::MainLoop() 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]); @@ -380,48 +302,6 @@ void wxApp::OnIdle(wxIdleEvent& event) 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)