From 8a27fa9c617533e76673ce61a65e2ba869b52208 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 31 Aug 2020 20:07:13 -0400 Subject: add upstream 11.1 --- wx+/app_main.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'wx+/app_main.h') diff --git a/wx+/app_main.h b/wx+/app_main.h index 570a2a9c..17a59d7b 100644 --- a/wx+/app_main.h +++ b/wx+/app_main.h @@ -21,16 +21,10 @@ bool globalWindowWasSet(); - //######################## implementation ######################## namespace impl { -inline -bool& refGlobalWindowStatus() -{ - static bool status = false; //external linkage! - return status; -} +inline bool haveGlobalWindow = false; } @@ -40,10 +34,12 @@ void setGlobalWindow(wxWindow* window) wxTheApp->SetTopWindow(window); wxTheApp->SetExitOnFrameDelete(true); - impl::refGlobalWindowStatus() = true; + impl::haveGlobalWindow = true; } -inline bool globalWindowWasSet() { return impl::refGlobalWindowStatus(); } + +inline +bool globalWindowWasSet() { return impl::haveGlobalWindow; } } #endif //APP_MAIN_H_08215601837818347575856 -- cgit