really show the window after creation (calling Show(TRUE) doesn't do it any more)

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index bdbed9efd0b3525d896c293d602e465b06e4f854..e6d803cbe432f2354e59d41b763123ad6151a55d 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -27,206 +27,460 @@
     #include "wx/app.h"
     #include "wx/debug.h"
     #include "wx/filefn.h"
     #include "wx/app.h"
     #include "wx/debug.h"
     #include "wx/filefn.h"

+    #include "wx/log.h"
+    #include "wx/thread.h"

 #endif
 
 #endif
 

-#include "wx/module.h"
+#include "wx/init.h"

 
 

-// ----------------------------------------------------------------------------
-// global vars
-// ----------------------------------------------------------------------------
+#include "wx/ptr_scpd.h"
+#include "wx/module.h"
+#include "wx/except.h"

 
 

-WXDLLEXPORT wxApp *wxTheApp = NULL;
+#if defined(__WXMSW__) && defined(__WXDEBUG__)
+    #include "wx/msw/msvcrt.h"

 
 

-wxAppInitializerFunction
-    wxAppBase::m_appInitFn = (wxAppInitializerFunction)NULL;
+    static struct EnableMemLeakChecking
+    {
+        EnableMemLeakChecking()
+        {
+            // do check for memory leaks on program exit (another useful flag
+            // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated
+            // memory which may be used to simulate low-memory condition)
+            wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+        }
+    } gs_enableLeakChecks;
+#endif // __WXMSW__ && __WXDEBUG__

 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 

-class /* no WXDLLEXPORT */ wxConsoleApp : public wxApp
+// we need a dummy app object if the user doesn't want to create a real one
+class wxDummyConsoleApp : public wxAppConsole
+{
+public:
+    wxDummyConsoleApp() { }
+
+    virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
+
+    DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
+};
+
+// we need a special kind of auto pointer to wxApp which not only deletes the
+// pointer it holds in its dtor but also resets the global application pointer
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
+
+class wxAppPtr : public wxAppPtrBase
+{
+public:
+    wxEXPLICIT wxAppPtr(wxAppConsole *ptr = NULL) : wxAppPtrBase(ptr) { }
+    ~wxAppPtr()
+    {
+        if ( get() )
+        {
+            // the pointer is going to be deleted in the base class dtor, don't
+            // leave the dangling pointer!
+            wxApp::SetInstance(NULL);
+        }
+    }
+
+    void Set(wxAppConsole *ptr)
+    {
+        reset(ptr);
+
+        wxApp::SetInstance(ptr);
+    }
+
+    DECLARE_NO_COPY_CLASS(wxAppPtr)
+};
+
+// class to ensure that wxAppBase::CleanUp() is called if our Initialize()
+// fails
+class wxCallAppCleanup
+{
+public:
+    wxCallAppCleanup(wxAppConsole *app) : m_app(app) { }
+    ~wxCallAppCleanup() { if ( m_app ) m_app->CleanUp(); }
+
+    void Dismiss() { m_app = NULL; }
+
+private:
+    wxAppConsole *m_app;
+};
+
+// another tiny class which simply exists to ensure that wxEntryCleanup is
+// always called
+class wxCleanupOnExit

 {
 public:
 {
 public:

-    virtual int OnRun() { wxFAIL_MSG(wxT("unreachable")); return 0; }
+    ~wxCleanupOnExit() { wxEntryCleanup(); }

 };
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

-static bool DoInit();
-static void DoCleanUp();
+// suppress warnings about unused variables
+static inline void Use(void *) { }
+
+#define WX_SUPPRESS_UNUSED_WARN(x) Use(&x)

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// private vars
+// initialization data

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-static size_t gs_nInitCount = 0;
+static struct InitData
+{
+    InitData()
+    {
+        nInitCount = 0;
+
+#if wxUSE_UNICODE
+        argc = 0;
+        // argv = NULL; -- not even really needed
+#endif // wxUSE_UNICODE
+    }
+
+    // critical section protecting this struct
+    wxCRIT_SECT_DECLARE_MEMBER(csInit);
+
+    // number of times wxInitialize() was called minus the number of times
+    // wxUninitialize() was
+    size_t nInitCount;
+
+#if wxUSE_UNICODE
+    int argc;
+
+    // if we receive the command line arguments as ASCII and have to convert
+    // them to Unicode ourselves (this is the case under Unix but not Windows,
+    // for example), we remember the converted argv here because we'll have to
+    // free it when doing cleanup to avoid memory leaks
+    wchar_t **argv;
+#endif // wxUSE_UNICODE
+
+    DECLARE_NO_COPY_CLASS(InitData)
+} gs_initData;

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// stubs for some GUI functions
+// command line arguments ANSI -> Unicode conversion

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void WXDLLEXPORT wxExit()
+#if wxUSE_UNICODE
+
+static void ConvertArgsToUnicode(int argc, char **argv)

 {
 {

-    abort();
+    gs_initData.argv = new wchar_t *[argc + 1];
+    for ( int i = 0; i < argc; i++ )
+    {
+        gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
+    }
+
+    gs_initData.argv[argc] = NULL;

 }
 
 }
 

-// Yield to other apps/messages
-void WXDLLEXPORT wxWakeUpIdle()
+static void FreeConvertedArgs()

 {
 {

-    // do nothing
+    if ( gs_initData.argv )
+    {
+        for ( int i = 0; i < gs_initData.argc; i++ )
+        {
+            free(gs_initData.argv[i]);
+        }
+
+        delete [] gs_initData.argv;
+        gs_initData.argv = NULL;
+    }

 }
 
 }
 

+#endif // wxUSE_UNICODE
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxBase-specific functions
+// start up

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool WXDLLEXPORT wxInitialize()
+// initialization which is always done (not customizable) before wxApp creation
+static bool DoCommonPreInit()

 {
 {

-    if ( gs_nInitCount )
+    return true;
+}
+
+// non customizable initialization done after wxApp creation and initialization
+static bool DoCommonPostInit()
+{
+    wxModule::RegisterModules();
+
+    return wxModule::InitializeModules();
+}
+
+bool wxEntryStart(int& argc, wxChar **argv)
+{
+    // do minimal, always necessary, initialization
+    // --------------------------------------------
+
+    // initialize wxRTTI
+    if ( !DoCommonPreInit() )

     {
     {

-        // already initialized
-        return TRUE;
+        return false;

     }
 
     }
 

-    wxASSERT_MSG( !wxTheApp,
-                  wxT("either call wxInitialize or create app, not both!") );

 
 

-    if ( !DoInit() )
+    // first of all, we need an application object
+    // -------------------------------------------
+
+    // the user might have already created it himself somehow
+    wxAppPtr app(wxTheApp);
+    if ( !app.get() )
+    {
+        // if not, he might have used IMPLEMENT_APP() to give us a function to
+        // create it
+        wxAppInitializerFunction fnCreate = wxApp::GetInitializerFunction();
+
+        if ( fnCreate )
+        {
+            // he did, try to create the custom wxApp object
+            app.Set((*fnCreate)());
+        }
+    }
+
+    if ( !app.get() )

     {
     {

-        return FALSE;
+        // either IMPLEMENT_APP() was not used at all or it failed -- in any
+        // case we still need something
+        app.Set(new wxDummyConsoleApp);

     }
 
     }
 

-    wxTheApp = new wxConsoleApp;

 
 

-    if ( !wxTheApp )
+    // wxApp initialization: this can be customized
+    // --------------------------------------------
+
+    if ( !app->Initialize(argc, argv) )

     {
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    wxTheApp->DoInit();
-    gs_nInitCount++;
+    wxCallAppCleanup callAppCleanup(app.get());
+
+    // for compatibility call the old initialization function too
+    if ( !app->OnInitGui() )
+        return false;
+
+
+    // common initialization after wxTheApp creation
+    // ---------------------------------------------

 
 

-    return TRUE;
+    if ( !DoCommonPostInit() )
+        return false;
+
+
+    // prevent the smart pointer from destroying its contents
+    app.release();
+
+    // and the cleanup object from doing cleanup
+    callAppCleanup.Dismiss();
+
+    return true;

 }
 
 }
 

-void WXDLLEXPORT wxUninitialize()
+#if wxUSE_UNICODE
+
+// we provide a wxEntryStart() wrapper taking "char *" pointer too
+bool wxEntryStart(int& argc, char **argv)

 {
 {

-    if ( !--gs_nInitCount )
+    ConvertArgsToUnicode(argc, argv);
+
+    if ( !wxEntryStart(argc, gs_initData.argv) )

     {
     {

-        DoCleanUp();
+        FreeConvertedArgs();
+
+        return false;

     }
     }

+
+    return true;

 }
 
 }
 

-int wxEntry(int argc, char **argv)
+#endif // wxUSE_UNICODE
+
+// ----------------------------------------------------------------------------
+// clean up
+// ----------------------------------------------------------------------------
+
+// cleanup done before destroying wxTheApp 
+static void DoCommonPreCleanup()
+{
+#if wxUSE_LOG
+    // flush the logged messages if any and install a 'safer' log target: the
+    // default one (wxLogGui) can't be used after the resources are freed just
+    // below and the user supplied one might be even more unsafe (using any
+    // wxWindows GUI function is unsafe starting from now)
+    wxLog::DontCreateOnDemand();
+
+    // this will flush the old messages if any
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif // wxUSE_LOG
+
+    wxModule::CleanUpModules();
+}
+
+// cleanup done after destroying wxTheApp
+static void DoCommonPostCleanup()
+{
+    wxClassInfo::CleanUp();
+
+    // we can't do this in wxApp itself because it doesn't know if argv had
+    // been allocated
+#if wxUSE_UNICODE
+    FreeConvertedArgs();
+#endif // wxUSE_UNICODE
+
+    // Note: check for memory leaks is now done via wxDebugContextDumpDelayCounter
+#if wxUSE_LOG
+    // and now delete the last logger as well
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+}
+
+void wxEntryCleanup()
+{
+    DoCommonPreCleanup();
+
+
+    // delete the application object
+    if ( wxTheApp )
+    {
+        wxTheApp->CleanUp();
+
+        delete wxTheApp;
+        wxApp::SetInstance(NULL);
+    }
+
+
+    DoCommonPostCleanup();
+}
+
+// ----------------------------------------------------------------------------
+// wxEntry
+// ----------------------------------------------------------------------------
+
+#if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
+    #define wxEntryReal wxEntry
+#endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
+
+int wxEntryReal(int& argc, wxChar **argv)

 {
     // library initialization
 {
     // library initialization

-    if ( !DoInit() )
+    if ( !wxEntryStart(argc, argv) )

     {
         return -1;
     }
 
     {
         return -1;
     }
 

-    // create the app
-    if ( !wxTheApp )
+    // if wxEntryStart succeeded, we must call wxEntryCleanup even if the code
+    // below returns or throws
+    wxCleanupOnExit cleanupOnExit;
+
+    WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
+
+    wxTRY

     {
     {

-        wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
-                wxT("No application object: use IMPLEMENT_APP macro.") );

 
 

-        wxAppInitializerFunction fnCreate = wxApp::GetInitializerFunction();
+        // app initialization
+        if ( !wxTheApp->CallOnInit() )
+        {
+            // don't call OnExit() if OnInit() failed
+            return -1;
+        }
+
+        // ensure that OnExit() is called if OnInit() had succeeded
+        class CallOnExit
+        {
+        public:
+            ~CallOnExit() { wxTheApp->OnExit(); }
+        } callOnExit;
+
+        WX_SUPPRESS_UNUSED_WARN(callOnExit);

 
 

-        wxTheApp = (wxApp *)fnCreate();
+        // app execution
+        return wxTheApp->OnRun();

     }
     }

+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
+}
+
+// wrap real wxEntry in a try-except block to be able to call
+// OnFatalException() if necessary
+#if defined(__WXMSW__) && wxUSE_ON_FATAL_EXCEPTION

 
 

-    wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );
+#ifdef __WXWINCE__
+// For ExitThread
+#include "wx/msw/private.h"
+#endif

 
 

-    // app preinitialization
-    wxTheApp->argc = argc;
+extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);

 
 

-#if wxUSE_UNICODE
-    wxTheApp->argv = new wxChar*[argc+1];
-    int mb_argc = 0;
-    while (mb_argc < argc)
+int wxEntry(int& argc, wxChar **argv)
+{
+    __try

     {
     {

-        wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
-        mb_argc++;
+        return wxEntryReal(argc, argv);

     }
     }

-    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
+    __except ( wxGlobalSEHandler(GetExceptionInformation()) )
+    {
+#ifdef __WXWINCE__
+        ::ExitThread(3); // the same exit code as abort()

 #else
 #else

-    wxTheApp->argv = argv;
+        ::ExitProcess(3); // the same exit code as abort()

 #endif
 
 #endif
 

-    wxString name = wxFileNameFromPath(argv[0]);
-    wxStripExtension(name);
-    wxTheApp->SetAppName(name);
-
-    int retValue = 0;
-
-    // app initialization
-    if ( !wxTheApp->OnInit() )
-        retValue = -1;
+#if !defined(_MSC_VER) || _MSC_VER < 1300
+        // this code is unreachable but put it here to suppress warnings
+        // from some compilers
+        return -1;
+#endif
+    }
+}

 
 

-    // app execution
-    if ( retValue == 0 )
-    {
-        retValue = wxTheApp->OnRun();
+#endif // __WXMSW__ && wxUSE_ON_FATAL_EXCEPTION

 
 

-        // app clean up
-        wxTheApp->OnExit();
-    }
+#if wxUSE_UNICODE

 
 

-    // library clean up
-    DoCleanUp();
+// as with wxEntryStart, we provide an ANSI wrapper
+int wxEntry(int& argc, char **argv)
+{
+    ConvertArgsToUnicode(argc, argv);

 
 

-    return retValue;
+    return wxEntry(argc, gs_initData.argv);

 }
 
 }
 

+#endif // wxUSE_UNICODE
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// private functions
+// wxInitialize/wxUninitialize

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-static bool DoInit()
+bool wxInitialize(int argc, wxChar **argv)

 {
 {

-    wxClassInfo::InitializeClasses();
+    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);

 
 

-    wxModule::RegisterModules();
-    if ( !wxModule::InitializeModules() )
+    if ( gs_initData.nInitCount++ )

     {
     {

-        return FALSE;
+        // already initialized
+        return true;

     }
 
     }
 

-    return TRUE;
+    return wxEntryStart(argc, argv);

 }
 
 }
 

-static void DoCleanUp()
+void wxUninitialize()

 {
 {

-#if wxUSE_LOG
-    // flush the logged messages if any
-    wxLog *log = wxLog::GetActiveTarget();
-    if (log != NULL && log->HasPendingMessages())
-        log->Flush();
-
-    // continuing to use user defined log target is unsafe from now on because
-    // some resources may be already unavailable, so replace it by something
-    // more safe
-    wxLog::DontCreateOnDemand();
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
-
-    wxModule::CleanUpModules();
-
-    wxClassInfo::CleanUpClasses();
+    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);

 
 

-    // delete the application object
-    delete wxTheApp;
-    wxTheApp = (wxApp *)NULL;
-
-#if wxUSE_LOG
-    // and now delete the last logger as well
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
+    if ( !--gs_initData.nInitCount )
+    {
+        wxEntryCleanup();
+    }

 }
 }

+