#include "wx/filefn.h"
#include "wx/log.h"
#include "wx/thread.h"
+ #include "wx/intl.h"
#endif
#include "wx/init.h"
#include "wx/ptr_scpd.h"
#include "wx/module.h"
+#include "wx/except.h"
#if defined(__WXMSW__) && defined(__WXDEBUG__)
#include "wx/msw/msvcrt.h"
// 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
{
gs_initData.argv = new wchar_t *[argc + 1];
for ( int i = 0; i < argc; i++ )
{
- gs_initData.argv[i] = wxStrdup(wxConvLocal.cMB2WX(argv[i]));
+ wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
+ gs_initData.argv[i] = buf ? wxStrdup(buf) : NULL;
}
+ gs_initData.argc = argc;
gs_initData.argv[argc] = NULL;
}
delete [] gs_initData.argv;
gs_initData.argv = NULL;
+ gs_initData.argc = 0;
}
}
// initialization which is always done (not customizable) before wxApp creation
static bool DoCommonPreInit()
{
- wxClassInfo::InitializeClasses();
+#if wxUSE_LOG
+ // install temporary log sink: we can't use wxLogGui before wxApp is
+ // constructed and if we use wxLogStderr, all messages during
+ // initialization simply disappear under Windows
+ //
+ // note that we will delete this log target below
+ delete wxLog::SetActiveTarget(new wxLogBuffer);
+#endif // wxUSE_LOG
return true;
}
{
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)
// 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;
}
// 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
- // 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
-
- wxModule::CleanUpModules();
}
// cleanup done after destroying wxTheApp
static void DoCommonPostCleanup()
{
- wxClassInfo::CleanUpClasses();
+ wxModule::CleanUpModules();
// we can't do this in wxApp itself because it doesn't know if argv had
// been allocated
FreeConvertedArgs();
#endif // wxUSE_UNICODE
+ // 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
// and now delete the last logger as well
delete wxLog::SetActiveTarget(NULL);
DoCommonPostCleanup();
-
- // 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
-
}
// ----------------------------------------------------------------------------
// wxEntry
// ----------------------------------------------------------------------------
-#if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
+// for MSW the real wxEntry is defined in msw/main.cpp
+#ifndef __WXMSW__
#define wxEntryReal wxEntry
-#endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
+#endif // !__WXMSW__
int wxEntryReal(int& argc, wxChar **argv)
{
// library initialization
if ( !wxEntryStart(argc, argv) )
{
+#if wxUSE_LOG
+ // flush any log messages explaining why we failed
+ delete wxLog::SetActiveTarget(NULL);
+#endif
return -1;
}
WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
- // app initialization
- if ( !wxTheApp->CallOnInit() )
+ wxTRY
{
- // don't call OnExit() if OnInit() failed
- return -1;
- }
-
- // app execution
- int retValue = wxTheApp->OnRun();
-
- // app clean up
- wxTheApp->OnExit();
- return retValue;
-}
-
-// 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
+ // app initialization
+ if ( !wxTheApp->CallOnInit() )
+ {
+ // don't call OnExit() if OnInit() failed
+ return -1;
+ }
-extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
+ // ensure that OnExit() is called if OnInit() had succeeded
+ class CallOnExit
+ {
+ public:
+ ~CallOnExit() { wxTheApp->OnExit(); }
+ } callOnExit;
-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
+ WX_SUPPRESS_UNUSED_WARN(callOnExit);
-#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
+ return wxTheApp->OnRun();
}
+ wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
}
-#endif // __WXMSW__ && wxUSE_ON_FATAL_EXCEPTION
-
#if wxUSE_UNICODE
// as with wxEntryStart, we provide an ANSI wrapper
{
wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
- if ( !--gs_initData.nInitCount )
+ if ( --gs_initData.nInitCount == 0 )
{
wxEntryCleanup();
}
projects / wxWidgets.git / blobdiff