X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150cb19558c0ef29aa7f76b48a7e332bc743dda7..b0cb01589f81b1794e07b82ff3d23f9757fb33d2:/src/common/init.cpp diff --git a/src/common/init.cpp b/src/common/init.cpp index 14d6056929..4db4aab90d 100644 --- a/src/common/init.cpp +++ b/src/common/init.cpp @@ -111,6 +111,15 @@ public: ~wxCleanupOnExit() { wxEntryCleanup(); } }; +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +// suppress warnings about unused variables +static inline void Use(void *) { } + +#define WX_SUPPRESS_UNUSED_WARN(x) Use(&x) + // ---------------------------------------------------------------------------- // initialization data // ---------------------------------------------------------------------------- @@ -380,8 +389,10 @@ int wxEntryReal(int& argc, wxChar **argv) // below returns or throws wxCleanupOnExit cleanupOnExit; + WX_SUPPRESS_UNUSED_WARN(cleanupOnExit); + // app initialization - if ( !wxTheApp->OnInit() ) + if ( !wxTheApp->CallOnInit() ) { // don't call OnExit() if OnInit() failed return -1;