remove unnecessary include of wx/cairo.h

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index bb56dd4007ea396a2d37eb61f4a6ec65851e7783..ee45254523a7b28c38c3e72ea8f011fb793aac6d 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/init.cpp
+// Name:        src/common/init.cpp

 // Purpose:     initialisation for the library
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     initialisation for the library
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -20,37 +20,44 @@
 #include "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef    __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif  //__BORLANDC__
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/debug.h"

     #include "wx/filefn.h"
     #include "wx/log.h"
     #include "wx/filefn.h"
     #include "wx/log.h"

-    #include "wx/thread.h"
+    #include "wx/intl.h"
+    #include "wx/module.h"

 #endif
 
 #include "wx/init.h"
 #endif
 
 #include "wx/init.h"

+#include "wx/thread.h"

 
 

-#include "wx/ptr_scpd.h"
-#include "wx/module.h"
+#include "wx/scopedptr.h"

 #include "wx/except.h"
 
 #include "wx/except.h"
 

-#if defined(__WXMSW__) && defined(__WXDEBUG__)
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h"

     #include "wx/msw/msvcrt.h"
 
     #include "wx/msw/msvcrt.h"
 

-    static struct EnableMemLeakChecking
-    {
-        EnableMemLeakChecking()
+    #ifdef wxCrtSetDbgFlag
+        static struct 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__
+            EnableMemLeakChecking()
+            {
+                // 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 // wxCrtSetDbgFlag
+#endif // __WINDOWS__
+
+#if wxUSE_UNICODE && defined(__WXOSX__)
+    #include <locale.h>
+#endif

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


@@ -62,15 +69,16 @@ class wxDummyConsoleApp : public wxAppConsole
 public:
     wxDummyConsoleApp() { }
 
 public:
     wxDummyConsoleApp() { }
 

-    virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
+    virtual int OnRun() { wxFAIL_MSG( wxT("unreachable code") ); return 0; }
+    virtual bool DoYield(bool, long) { return true; }

 
 

-    DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
+    wxDECLARE_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
 };
 
 // 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);
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)

 
 class wxAppPtr : public wxAppPtrBase
 {
 
 class wxAppPtr : public wxAppPtrBase
 {


@@ -93,7 +101,7 @@ public:
         wxApp::SetInstance(ptr);
     }
 
         wxApp::SetInstance(ptr);
     }
 

-    DECLARE_NO_COPY_CLASS(wxAppPtr)
+    wxDECLARE_NO_COPY_CLASS(wxAppPtr);

 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()
 };
 
 // class to ensure that wxAppBase::CleanUp() is called if our Initialize()


@@ -110,14 +118,6 @@ private:
     wxAppConsole *m_app;
 };
 
     wxAppConsole *m_app;
 };
 

-// another tiny class which simply exists to ensure that wxEntryCleanup is
-// always called
-class wxCleanupOnExit
-{
-public:
-    ~wxCleanupOnExit() { wxEntryCleanup(); }
-};
-

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -160,7 +160,7 @@ static struct InitData
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 
     wchar_t **argv;
 #endif // wxUSE_UNICODE
 

-    DECLARE_NO_COPY_CLASS(InitData)
+    wxDECLARE_NO_COPY_CLASS(InitData);

 } gs_initData;
 
 // ============================================================================
 } gs_initData;
 
 // ============================================================================


@@ -176,12 +176,27 @@ static struct InitData
 static void ConvertArgsToUnicode(int argc, char **argv)
 {
     gs_initData.argv = new wchar_t *[argc + 1];
 static void ConvertArgsToUnicode(int argc, char **argv)
 {
     gs_initData.argv = new wchar_t *[argc + 1];

+    int wargc = 0;

     for ( int i = 0; i < argc; i++ )
     {
     for ( int i = 0; i < argc; i++ )
     {

-        gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
+#ifdef __DARWIN__
+        wxWCharBuffer buf(wxConvFileName->cMB2WX(argv[i]));
+#else
+        wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
+#endif
+        if ( !buf )
+        {
+            wxLogWarning(_("Command line argument %d couldn't be converted to Unicode and will be ignored."),
+                         i);
+        }
+        else // converted ok
+        {
+            gs_initData.argv[wargc++] = wxStrdup(buf);
+        }

     }
 
     }
 

-    gs_initData.argv[argc] = NULL;
+    gs_initData.argc = wargc;
+    gs_initData.argv[wargc] = NULL;

 }
 
 static void FreeConvertedArgs()
 }
 
 static void FreeConvertedArgs()


@@ -193,8 +208,8 @@ static void FreeConvertedArgs()
             free(gs_initData.argv[i]);
         }
 
             free(gs_initData.argv[i]);
         }
 

-        delete [] gs_initData.argv;
-        gs_initData.argv = NULL;
+        wxDELETEA(gs_initData.argv);
+        gs_initData.argc = 0;

     }
 }
 
     }
 }
 


@@ -207,6 +222,48 @@ static void FreeConvertedArgs()
 // initialization which is always done (not customizable) before wxApp creation
 static bool DoCommonPreInit()
 {
 // initialization which is always done (not customizable) before wxApp creation
 static bool DoCommonPreInit()
 {

+#if wxUSE_UNICODE && defined(__WXOSX__)
+    // In OS X and iOS, wchar_t CRT functions convert to char* and fail under
+    // some locales. The safest fix is to set LC_CTYPE to UTF-8 to ensure that
+    // they can handle any input.
+    //
+    // Note that this must be done for any app, Cocoa or console, whether or
+    // not it uses wxLocale.
+    //
+    // See http://stackoverflow.com/questions/11713745/why-does-the-printf-family-of-functions-care-about-locale
+    setlocale(LC_CTYPE, "UTF-8");
+#endif // wxUSE_UNICODE && defined(__WXOSX__)
+
+#if wxUSE_LOG
+    // Reset logging in case we were cleaned up and are being reinitialized.
+    wxLog::DoCreateOnDemand();
+
+    // force wxLog to create a log target now: we do it because wxTheApp
+    // doesn't exist yet so wxLog will create a special log target which is
+    // safe to use even when the GUI is not available while without this call
+    // we could create wxApp in wxEntryStart() below, then log an error about
+    // e.g. failure to establish connection to the X server and wxLog would
+    // send it to wxLogGui (because wxTheApp does exist already) which, of
+    // course, can't be used in this case
+    //
+    // notice also that this does nothing if the user had set up a custom log
+    // target before -- which is fine as we want to give him this possibility
+    // (as it's impossible to override logging by overriding wxAppTraits::
+    // CreateLogTarget() before wxApp is created) and we just assume he knows
+    // what he is doing
+    wxLog::GetActiveTarget();
+#endif // wxUSE_LOG
+
+#ifdef __WINDOWS__
+    // GUI applications obtain HINSTANCE in their WinMain() but we also need to
+    // initialize the global wxhInstance variable for the console programs as
+    // they may need it too, so set it here if it wasn't done yet
+    if ( !wxGetInstance() )
+    {
+        wxSetInstance(::GetModuleHandle(NULL));
+    }
+#endif // __WINDOWS__
+

     return true;
 }
 
     return true;
 }
 


@@ -215,7 +272,13 @@ static bool DoCommonPostInit()
 {
     wxModule::RegisterModules();
 
 {
     wxModule::RegisterModules();
 

-    return wxModule::InitializeModules();
+    if ( !wxModule::InitializeModules() )
+    {
+        wxLogError(_("Initialization failed in post init, aborting."));
+        return false;
+    }
+
+    return true;

 }
 
 bool wxEntryStart(int& argc, wxChar **argv)
 }
 
 bool wxEntryStart(int& argc, wxChar **argv)


@@ -225,9 +288,7 @@ bool wxEntryStart(int& argc, wxChar **argv)
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )
 
     // initialize wxRTTI
     if ( !DoCommonPreInit() )

-    {

         return false;
         return false;

-    }

 
 
     // first of all, we need an application object
 
 
     // first of all, we need an application object


@@ -260,15 +321,14 @@ bool wxEntryStart(int& argc, wxChar **argv)
     // --------------------------------------------
 
     if ( !app->Initialize(argc, argv) )
     // --------------------------------------------
 
     if ( !app->Initialize(argc, argv) )

-    {

         return false;
         return false;

-    }

 
 

-    wxCallAppCleanup callAppCleanup(app.get());
+    // remember, possibly modified (e.g. due to removal of toolkit-specific
+    // parameters), command line arguments in member variables
+    app->argc = argc;
+    app->argv = argv;

 
 

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

 
 
     // common initialization after wxTheApp creation
 
 
     // common initialization after wxTheApp creation


@@ -284,6 +344,14 @@ bool wxEntryStart(int& argc, wxChar **argv)
     // and the cleanup object from doing cleanup
     callAppCleanup.Dismiss();
 
     // and the cleanup object from doing cleanup
     callAppCleanup.Dismiss();
 

+#if wxUSE_LOG
+    // now that we have a valid wxApp (wxLogGui would have crashed if we used
+    // it before now), we can delete the temporary sink we had created for the
+    // initialization messages -- the next time logging function is called, the
+    // sink will be recreated but this time wxAppTraits will be used
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+

     return true;
 }
 
     return true;
 }
 


@@ -294,7 +362,7 @@ bool wxEntryStart(int& argc, char **argv)
 {
     ConvertArgsToUnicode(argc, argv);
 
 {
     ConvertArgsToUnicode(argc, argv);
 

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

     {
         FreeConvertedArgs();
 
     {
         FreeConvertedArgs();
 


@@ -310,27 +378,26 @@ bool wxEntryStart(int& argc, char **argv)
 // clean up
 // ----------------------------------------------------------------------------
 
 // clean up
 // ----------------------------------------------------------------------------
 

-// cleanup done before destroying wxTheApp 
+// cleanup done before destroying wxTheApp

 static void DoCommonPreCleanup()
 {
 #if wxUSE_LOG
 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);
+    // flush the logged messages if any and don't use the current probably
+    // unsafe log target any more: the default one (wxLogGui) can't be used
+    // after the resources are freed which happens when we return and the user
+    // supplied one might be even more unsafe (using any wxWidgets GUI function
+    // is unsafe starting from now)
+    //
+    // notice that wxLog will still recreate a default log target if any
+    // messages are logged but that one will be safe to use until the very end
+    delete wxLog::SetActiveTarget(NULL);

 #endif // wxUSE_LOG
 #endif // wxUSE_LOG

-
-    wxModule::CleanUpModules();

 }
 
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {
 }
 
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {

-    wxClassInfo::CleanUp();
+    wxModule::CleanUpModules();

 
     // we can't do this in wxApp itself because it doesn't know if argv had
     // been allocated
 
     // we can't do this in wxApp itself because it doesn't know if argv had
     // been allocated


@@ -338,18 +405,23 @@ static void DoCommonPostCleanup()
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 

-    // check for memory leaks
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug(wxT("There were memory leaks.\n"));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#endif // Debug
+    // use Set(NULL) and not Get() to avoid creating a message output object on
+    // demand when we just want to delete it
+    delete wxMessageOutput::Set(NULL);

 
 #if wxUSE_LOG
 
 #if wxUSE_LOG

+    // call this first as it has a side effect: in addition to flushing all
+    // logs for this thread, it also flushes everything logged from other
+    // threads
+    wxLog::FlushActive();
+

     // and now delete the last logger as well
     // and now delete the last logger as well

+    //
+    // we still don't disable log target auto-vivification even if any log
+    // objects created now will result in memory leaks because it seems better
+    // to leak memory which doesn't matter much considering the application is
+    // exiting anyhow than to not show messages which could still be logged
+    // from the user code (e.g. static dtors and such)

     delete wxLog::SetActiveTarget(NULL);
 #endif // wxUSE_LOG
 }
     delete wxLog::SetActiveTarget(NULL);
 #endif // wxUSE_LOG
 }


@@ -364,8 +436,12 @@ void wxEntryCleanup()
     {
         wxTheApp->CleanUp();
 
     {
         wxTheApp->CleanUp();
 

-        delete wxTheApp;
+        // reset the global pointer to it to NULL before destroying it as in
+        // some circumstances this can result in executing the code using
+        // wxTheApp and using half-destroyed object is no good
+        wxAppConsole * const app = wxApp::GetInstance();

         wxApp::SetInstance(NULL);
         wxApp::SetInstance(NULL);

+        delete app;

     }
 
 
     }
 
 


@@ -376,35 +452,27 @@ void wxEntryCleanup()
 // wxEntry
 // ----------------------------------------------------------------------------
 
 // wxEntry
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
+// for MSW the real wxEntry is defined in msw/main.cpp
+#ifndef __WINDOWS__

     #define wxEntryReal wxEntry
     #define wxEntryReal wxEntry

-#endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
+#endif // !__WINDOWS__

 
 int wxEntryReal(int& argc, wxChar **argv)
 {
     // library initialization
 
 int wxEntryReal(int& argc, wxChar **argv)
 {
     // library initialization

-    if ( !wxEntryStart(argc, argv) )
+    wxInitializer initializer(argc, argv);
+
+    if ( !initializer.IsOk() )

     {
     {

+#if wxUSE_LOG
+        // flush any log messages explaining why we failed
+        delete wxLog::SetActiveTarget(NULL);
+#endif

         return -1;
     }
 
         return -1;
     }
 

-    // if wxEntryStart succeeded, we must call wxEntryCleanup even if the code
-    // below returns or throws
-    wxCleanupOnExit cleanupOnExit;
-
-    WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
-
-#if defined(__VISUALC__)
-       //Disable warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify -GX
-       #pragma warning (disable:4530)
-#endif  
-

     wxTRY
     {
     wxTRY
     {

-
-#if defined(__VISUALC__)
-       #pragma warning (default:4530)
-#endif  

         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {


@@ -427,41 +495,6 @@ int wxEntryReal(int& argc, wxChar **argv)
     wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
 }
 
     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
-
-#ifdef __WXWINCE__
-// For ExitThread
-#include "wx/msw/private.h"
-#endif
-
-extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
-
-int wxEntry(int& argc, wxChar **argv)
-{
-    __try
-    {
-        return wxEntryReal(argc, argv);
-    }
-    __except ( wxGlobalSEHandler(GetExceptionInformation()) )
-    {
-#ifdef __WXWINCE__
-        ::ExitThread(3); // the same exit code as abort()
-#else
-        ::ExitProcess(3); // the same exit code as abort()
-#endif
-
-#if !defined(_MSC_VER) || _MSC_VER < 1300
-        // this code is unreachable but put it here to suppress warnings
-        // from some compilers
-        return -1;
-#endif
-    }
-}
-
-#endif // __WXMSW__ && wxUSE_ON_FATAL_EXCEPTION
-

 #if wxUSE_UNICODE
 
 // as with wxEntryStart, we provide an ANSI wrapper
 #if wxUSE_UNICODE
 
 // as with wxEntryStart, we provide an ANSI wrapper


@@ -469,7 +502,7 @@ int wxEntry(int& argc, char **argv)
 {
     ConvertArgsToUnicode(argc, argv);
 
 {
     ConvertArgsToUnicode(argc, argv);
 

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

 }
 
 #endif // wxUSE_UNICODE
 }
 
 #endif // wxUSE_UNICODE


@@ -478,6 +511,11 @@ int wxEntry(int& argc, char **argv)
 // wxInitialize/wxUninitialize
 // ----------------------------------------------------------------------------
 
 // wxInitialize/wxUninitialize
 // ----------------------------------------------------------------------------
 

+bool wxInitialize()
+{
+    return wxInitialize(0, (wxChar**)NULL);
+}
+

 bool wxInitialize(int argc, wxChar **argv)
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
 bool wxInitialize(int argc, wxChar **argv)
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);


@@ -491,13 +529,27 @@ bool wxInitialize(int argc, wxChar **argv)
     return wxEntryStart(argc, argv);
 }
 
     return wxEntryStart(argc, argv);
 }
 

+#if wxUSE_UNICODE
+bool wxInitialize(int argc, char **argv)
+{
+    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
+
+    if ( gs_initData.nInitCount++ )
+    {
+        // already initialized
+        return true;
+    }
+
+    return wxEntryStart(argc, argv);
+}
+#endif // wxUSE_UNICODE
+

 void wxUninitialize()
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
 
 void wxUninitialize()
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
 

-    if ( !--gs_initData.nInitCount )
+    if ( --gs_initData.nInitCount == 0 )

     {
         wxEntryCleanup();
     }
 }
     {
         wxEntryCleanup();
     }
 }

-