/////////////////////////////////////////////////////////////////////////////
-// 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/debug.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 defined(__WXMSW__) && defined(__WXDEBUG__)
wxDummyConsoleApp() { }
virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
+ virtual bool DoYield(bool, long) { return true; }
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);
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
class wxAppPtr : public wxAppPtrBase
{
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++ )
{
- 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.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
+ // Reset logging in case we were cleaned up and are being reinitialized.
+ wxLog::DoCreateOnDemand();
+
// 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
- wxLog::SetActiveTarget(new wxLogBuffer);
+ delete wxLog::SetActiveTarget(new wxLogBuffer);
#endif // wxUSE_LOG
return true;
return false;
}
+#if defined(__WXDEBUG__)
+ // check if event classes implement Clone() correctly
+ // NOTE: the check is done against _all_ event classes which are linked to
+ // the executable currently running, which are not necessarily all
+ // wxWidgets event classes.
+ const wxClassInfo *ci = wxClassInfo::GetFirst();
+ for (; ci; ci = ci->GetNext())
+ {
+ // is this class derived from wxEvent?
+ if (!ci->IsKindOf(CLASSINFO(wxEvent)) || wxString(ci->GetClassName()) == "wxEvent")
+ continue;
+
+ if (!ci->IsDynamic())
+ {
+ wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!",
+ ci->GetClassName());
+ continue;
+ }
+
+ // yes; test if it implements Clone() correctly
+ wxEvent* test = wxDynamicCast(ci->CreateObject(),wxEvent);
+ if (test == NULL)
+ {
+ wxLogWarning("The event class '%s' should have a DECLARE_DYNAMIC_CLASS macro!",
+ ci->GetClassName());
+ continue;
+ }
+
+ wxEvent* cloned = test->Clone();
+ if (!cloned || cloned->GetClassInfo() != ci)
+ wxLogWarning("The event class '%s' does not correctly implement Clone()!",
+ ci->GetClassName());
+
+ delete cloned;
+ delete test;
+ }
+#endif
+
return true;
}
return false;
}
+ // remember, possibly modified (e.g. due to removal of toolkit-specific
+ // parameters), command line arguments in member variables
+ app->argc = argc;
+ app->argv = argv;
+
+
wxCallAppCleanup callAppCleanup(app.get());
// for compatibility call the old initialization function too
{
ConvertArgsToUnicode(argc, argv);
- if ( !wxEntryStart(argc, gs_initData.argv) )
+ if ( !wxEntryStart(gs_initData.argc, gs_initData.argv) )
{
FreeConvertedArgs();
{
wxModule::CleanUpModules();
- 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
+ // 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);
{
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)
{
-#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) )
{
+#if wxUSE_LOG
// flush any log messages explaining why we failed
delete wxLog::SetActiveTarget(NULL);
+#endif
return -1;
}
{
ConvertArgsToUnicode(argc, argv);
- return wxEntry(argc, gs_initData.argv);
+ return wxEntry(gs_initData.argc, gs_initData.argv);
}
#endif // wxUSE_UNICODE
{
wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
- if ( !--gs_initData.nInitCount )
+ if ( --gs_initData.nInitCount == 0 )
{
wxEntryCleanup();
}
}
-
projects / wxWidgets.git / blobdiff