X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/505f0a85c9b59d8be30f2be1f7cf4fd3d663f721..d546eba94e77831c41e3370484a41181517bd611:/src/cocoa/app.mm?ds=sidebyside

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index d25e9d3230..62574e7a0e 100644
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -111,99 +111,6 @@ 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()
-{
-    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)
-    {
-        // 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()) ();
-    }
-
-    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 )
-    {
-        // Forcibly delete the window.
-        if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                topWindow->IsKindOf(CLASSINFO(wxDialog)) )
-        {
-            topWindow->Close(TRUE);
-        }
-        else
-        {
-            delete topWindow;
-            wxTheApp->SetTopWindow(NULL);
-        }
-    }
-
-    wxTheApp->OnExit();
-
-    wxEntryCleanup();
-
-    return retValue;
-}
-
 void wxApp::Exit()
 {
     wxApp::CleanUp();
@@ -229,86 +136,37 @@ END_EVENT_TABLE()
 #endif
 
 // ----------------------------------------------------------------------------
-// wxApp static functions
+// wxApp initialization/cleanup
 // ----------------------------------------------------------------------------
-/*static*/ bool wxApp::Initialize()
-{
-    wxPoseAsInitializer::InitializePosers();
-    wxClassInfo::InitializeClasses();
-
-#if wxUSE_THREADS
-    wxPendingEventsLocker = new wxCriticalSection;
-#endif
 
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
+bool wxApp::Initialize(int& argc, wxChar **argv)
+{
+    // 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--);
+        }
+    }
 
-    wxBitmap::InitStandardHandlers();
+    // Posing must be completed before any instances of the Objective-C
+    // classes being posed as are created.
+    wxPoseAsInitializer::InitializePosers();
 
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) {
-        return FALSE;
-    }
-    return TRUE;
+    return wxAppBase::Initialize(argc, argv);
 }
 
-/*static*/ void wxApp::CleanUp()
+void wxApp::CleanUp()
 {
-    wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-
-    wxDeleteStockObjects() ;
-
-    // Destroy all GDI lists, etc.
-    wxDeleteStockLists();
-
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-
-    wxBitmap::CleanUpHandlers();
-
-    delete wxPendingEvents;
-
-#if wxUSE_THREADS
-    delete wxPendingEventsLocker;
-    // If we don't do the following, we get an apparent memory leak.
-    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif
-
-    wxClassInfo::CleanUpClasses();
-
-    delete wxTheApp;
-    wxTheApp = NULL;
-
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // At this point we want to check if there are any memory
-    // blocks that aren't part of the wxDebugContext itself,
-    // as a special case. Then when dumping we need to ignore
-    // wxDebugContext, too.
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug(wxT("There were memory leaks."));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-    //  wxDebugContext::SetStream(NULL, NULL);
-#endif
-
     wxDC::CocoaShutdownTextSystem();
-#if wxUSE_LOG
-    // do it as the very last thing because everything else can log messages
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
+
+    wxAppBase::CleanUp();
 }
 
 // ----------------------------------------------------------------------------
@@ -521,21 +379,3 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return true;
 }
 
-void wxApp::DeletePendingObjects()
-{
-    wxNode *node = wxPendingDelete.GetFirst();
-    while (node)
-    {
-        wxObject *obj = (wxObject *)node->GetData();
-
-        delete obj;
-
-        if (wxPendingDelete.Find(obj))
-            delete node;
-
-        node = wxPendingDelete.GetFirst();
-    }
-}
-
-// platform specifics
-