From 70fb935a6a52fd27b288f4885c55cddf038b89f1 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 15 Sep 2003 15:34:11 +0000 Subject: [PATCH] Cleaned up some comments, reorganized some code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/app.mm | 51 +++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm index ec398d6724..92684dafc9 100644 --- a/src/cocoa/app.mm +++ b/src/cocoa/app.mm @@ -9,14 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/defs.h" @@ -45,12 +37,14 @@ #import #import -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - +// ======================================================================== +// wxPoseAsInitializer +// ======================================================================== wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; +// ======================================================================== +// wxPoserNSApplication +// ======================================================================== @interface wxPoserNSApplication : NSApplication { } @@ -60,6 +54,8 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication; @end // wxPoserNSApplication +WX_IMPLEMENT_POSER(wxPoserNSApplication); + @implementation wxPoserNSApplication : NSApplication - (void)doIdle: (id)data @@ -110,40 +106,24 @@ wxPoseAsInitializer *wxPoseAsInitializer::sm_first = NULL; } @end // wxPoserNSApplication -WX_IMPLEMENT_POSER(wxPoserNSApplication); - -// ============================================================================ -// 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(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; @@ -180,7 +160,6 @@ void wxApp::CleanUp() // ---------------------------------------------------------------------------- // wxApp creation // ---------------------------------------------------------------------------- - wxApp::wxApp() { m_topWindow = NULL; @@ -259,6 +238,13 @@ bool wxApp::Initialized() return FALSE; } +void wxApp::Exit() +{ + wxApp::CleanUp(); + + wxAppConsole::Exit(); +} + int wxApp::MainLoop() { [m_cocoaApp run]; @@ -292,7 +278,6 @@ void wxApp::Dispatch() } // Yield to other processes - bool wxApp::Yield(bool onlyIfNeeded) { // MT-FIXME -- 2.45.2