AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

the build options are now checked in the application, not the library which allows to avoid having to define wxGetBuildOptions()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-05-09 15:58:29 +00:00
parent 475ba112f4
commit e6e6fcc922
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/app.h
View File

@ -548,20 +548,14 @@ public:
#define IMPLEMENT_WX_THEME_SUPPORT #define IMPLEMENT_WX_THEME_SUPPORT
#endif #endif
// define the build options object for the application which is compared to the
// one used for building the library on the program startup
#define WX_DEFINE_BUILDOPTS() \
const wxBuildOptions& wxGetBuildOptions() \
{ \
static wxBuildOptions s_buildOptions; \
return s_buildOptions; \
}
// Use this macro if you want to define your own main() or WinMain() function // Use this macro if you want to define your own main() or WinMain() function
// and call wxEntry() from there. // and call wxEntry() from there.
#define IMPLEMENT_APP_NO_MAIN(appname) \ #define IMPLEMENT_APP_NO_MAIN(appname) \
WX_DEFINE_BUILDOPTS() \ wxApp *wxCreateApp() \
wxApp *wxCreateApp() { return new appname; } \ { \
wxApp::CheckBuildOptions(wxBuildOptions()); \
return new appname; \
} \
wxAppInitializer wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp); \ wxAppInitializer wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp); \
appname& wxGetApp() { return *(appname *)wxTheApp; } appname& wxGetApp() { return *(appname *)wxTheApp; }

19
src/common/appcmn.cpp
View File

@ -74,15 +74,6 @@
wxAppBase::wxAppBase() wxAppBase::wxAppBase()
{ {
// this function is defined by IMPLEMENT_APP() macro in the user code
extern const wxBuildOptions& wxGetBuildOptions();
if ( !CheckBuildOptions(wxGetBuildOptions()) )
{
wxLogFatalError(_T("Mismatch between the program and library build ")
_T("versions detected."));
}
wxTheApp = (wxApp *)this; wxTheApp = (wxApp *)this;
#if WXWIN_COMPATIBILITY_2_2 #if WXWIN_COMPATIBILITY_2_2
@ -375,9 +366,17 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
int verMaj = wxMAJOR_VERSION, int verMaj = wxMAJOR_VERSION,
verMin = wxMINOR_VERSION; verMin = wxMINOR_VERSION;
return wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin); if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
{
wxLogFatalError(_T("Mismatch between the program and library build ")
_T("versions detected."));
// normally wxLogFatalError doesn't return
return FALSE;
}
#undef wxCMP #undef wxCMP
return TRUE;
} }
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__