Set solid colour for whole control, not pages

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 15cca2da329b4794f78a1fe44969d5681bb7ff3f..c0ce4e9bcb4f7cd51fa945b226e2dd645c1eaded 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -181,6 +181,7 @@ static void ConvertArgsToUnicode(int argc, char **argv)
         gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
     }
 
         gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
     }
 

+    gs_initData.argc = argc;

     gs_initData.argv[argc] = NULL;
 }
 
     gs_initData.argv[argc] = NULL;
 }
 


@@ -195,6 +196,7 @@ static void FreeConvertedArgs()
 
         delete [] gs_initData.argv;
         gs_initData.argv = NULL;
 
         delete [] gs_initData.argv;
         gs_initData.argv = NULL;

+        gs_initData.argc = 0;

     }
 }
 
     }
 }
 


@@ -310,26 +312,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
     // 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
 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)
+    // wxWidgets 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
     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()
 {
 }
 
 // cleanup done after destroying wxTheApp
 static void DoCommonPostCleanup()
 {

+    wxModule::CleanUpModules();
+

     wxClassInfo::CleanUp();
 
     // we can't do this in wxApp itself because it doesn't know if argv had
     wxClassInfo::CleanUp();
 
     // we can't do this in wxApp itself because it doesn't know if argv had


@@ -338,16 +340,7 @@ 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
-
+    // 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);
 #if wxUSE_LOG
     // and now delete the last logger as well
     delete wxLog::SetActiveTarget(NULL);


@@ -376,12 +369,19 @@ void wxEntryCleanup()
 // wxEntry
 // ----------------------------------------------------------------------------
 
 // wxEntry
 // ----------------------------------------------------------------------------
 

+// for MSW with wxUSE_ON_FATAL_EXCEPTION on, wxEntry is defined in msw/main.cpp

 #if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
     #define wxEntryReal wxEntry
 #endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
 
 int wxEntryReal(int& argc, wxChar **argv)
 {
 #if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
     #define wxEntryReal wxEntry
 #endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
 
 int wxEntryReal(int& argc, wxChar **argv)
 {

+#if wxUSE_LOG
+    // Create a non-GUI log target, to be used until GUI (if any) is ready.
+    // Target will be reset by wxAppConsole::Initialize, when GUI logging will work.
+    wxLog::GetActiveTarget();
+#endif
+

     // library initialization
     if ( !wxEntryStart(argc, argv) )
     {
     // library initialization
     if ( !wxEntryStart(argc, argv) )
     {


@@ -396,6 +396,7 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     wxTRY
     {
 
     wxTRY
     {

+

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


@@ -410,47 +411,14 @@ int wxEntryReal(int& argc, wxChar **argv)
             ~CallOnExit() { wxTheApp->OnExit(); }
         } callOnExit;
 
             ~CallOnExit() { wxTheApp->OnExit(); }
         } callOnExit;
 

+        WX_SUPPRESS_UNUSED_WARN(callOnExit);
+

         // app execution
         return wxTheApp->OnRun();
     }
     wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
 }
 
         // 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
-
-#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