/////////////////////////////////////////////////////////////////////////////
-// Name: common/init.cpp
+// Name: src/common/init.cpp
// Purpose: initialisation for the library
// Author: Vadim Zeitlin
// Modified by:
#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+ #pragma hdrstop
#endif //__BORLANDC__
#ifndef WX_PRECOMP
#include "wx/app.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"
+#include "wx/thread.h"
-#include "wx/ptr_scpd.h"
-#include "wx/module.h"
+#include "wx/scopedptr.h"
#include "wx/except.h"
-#if wxUSE_FONTMAP
-#include "wx/fontmap.h"
-#endif
-#if defined(__WXMSW__) && defined(__WXDEBUG__)
+#if defined(__WXMSW__)
#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 // __WXMSW__
// ----------------------------------------------------------------------------
// private classes
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
wxApp::SetInstance(ptr);
}
- DECLARE_NO_COPY_CLASS(wxAppPtr)
+ wxDECLARE_NO_COPY_CLASS(wxAppPtr);
};
// class to ensure that wxAppBase::CleanUp() is called if our Initialize()
wxAppConsole *m_app;
};
-// another tiny class which simply exists to ensure that wxEntryCleanup is
-// always called
-class wxCleanupOnExit
-{
-public:
- ~wxCleanupOnExit() { wxEntryCleanup(); }
-};
-
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
wchar_t **argv;
#endif // wxUSE_UNICODE
- DECLARE_NO_COPY_CLASS(InitData)
+ wxDECLARE_NO_COPY_CLASS(InitData);
} gs_initData;
// ============================================================================
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++ )
{
+#ifdef __DARWIN__
+ wxWCharBuffer buf(wxConvFileName->cMB2WX(argv[i]));
+#else
wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
- gs_initData.argv[i] = buf ? wxStrdup(buf) : NULL;
+#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.argc = argc;
- gs_initData.argv[argc] = NULL;
+ gs_initData.argc = wargc;
+ gs_initData.argv[wargc] = NULL;
}
static void FreeConvertedArgs()
static bool DoCommonPreInit()
{
#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);
+ // Reset logging in case we were cleaned up and are being reinitialized.
+ wxLog::DoCreateOnDemand();
#endif // wxUSE_LOG
return true;
// initialize wxRTTI
if ( !DoCommonPreInit() )
- {
return false;
- }
// first of all, we need an application object
// --------------------------------------------
if ( !app->Initialize(argc, argv) )
- {
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
{
ConvertArgsToUnicode(argc, argv);
- if ( !wxEntryStart(argc, gs_initData.argv) )
+ if ( !wxEntryStart(gs_initData.argc, gs_initData.argv) )
{
FreeConvertedArgs();
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
- // wxWidgets 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
}
#if wxUSE_LOG
// 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
}
{
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);
+ delete app;
}
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
return -1;
}
- // if wxEntryStart succeeded, we must call wxEntryCleanup even if the code
- // below returns or throws
- wxCleanupOnExit cleanupOnExit;
-
- WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
-
wxTRY
{
-
// app initialization
if ( !wxTheApp->CallOnInit() )
{
{
ConvertArgsToUnicode(argc, argv);
-#if wxUSE_FONTMAP
- // If we created a font mapper during the above call,
- // it will only be the base class, so delete it to allow
- // app traits to create mapper.
- delete (wxFontMapperBase*) wxFontMapperBase::Set(NULL);
-#endif
-
- return wxEntry(argc, gs_initData.argv);
+ return wxEntry(gs_initData.argc, gs_initData.argv);
}
#endif // wxUSE_UNICODE
// wxInitialize/wxUninitialize
// ----------------------------------------------------------------------------
+bool wxInitialize()
+{
+ return wxInitialize(0, (wxChar**)NULL);
+}
+
bool wxInitialize(int argc, wxChar **argv)
{
wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
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);
projects / wxWidgets.git / blobdiff