only define globals when wxUSE_BASE to avoid duplicate definitions in wxBase and wxMSW (closes 1104289)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8228dac8ff
commit
58187c862c
@ -69,7 +69,7 @@
|
||||
|
||||
// wrap real wxEntry in a try-except block to be able to call
|
||||
// OnFatalException() if necessary
|
||||
#if wxUSE_ON_FATAL_EXCEPTION
|
||||
#if wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE
|
||||
|
||||
// global pointer to exception information, only valid inside OnFatalException,
|
||||
// used by wxStackWalker and wxCrashReport
|
||||
@ -191,7 +191,7 @@ int wxEntry(int& argc, wxChar **argv)
|
||||
}
|
||||
}
|
||||
|
||||
#endif // wxUSE_ON_FATAL_EXCEPTION
|
||||
#endif // wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user