merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -446,8 +446,23 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
{
wxLogFatalError(_T("Mismatch between the program and library build ")
_T("versions detected."));
wxString msg;
wxString libDebug, progDebug;
if (isDebug)
libDebug = wxT("debug");
else
libDebug = wxT("no debug");
if (opts.m_isDebug)
progDebug = wxT("debug");
else
progDebug = wxT("no debug");
msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %d.%d (%s), and your program used %d.%d (%s)."),
verMaj, verMin, libDebug.c_str(), opts.m_verMaj, opts.m_verMin, progDebug.c_str());
wxLogFatalError(msg);
// normally wxLogFatalError doesn't return
return FALSE;