From b38813a5e9efcb93df8d9d594e7ae63c6f96517e Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 27 Aug 2018 13:57:58 +0200 Subject: [PATCH] use Cocoa fix for nested modal loops for system dialogs also 2 Header was missing in 99eba63796143bf75704e387b2ab4c49369ebd7c, see #18204 --- include/wx/osx/dialog.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h index 88d5462f15..bce052f4c2 100644 --- a/include/wx/osx/dialog.h +++ b/include/wx/osx/dialog.h @@ -60,8 +60,13 @@ public: virtual void EndModal(int retCode); static bool OSXHasModalDialogsOpen(); - static void OSXBeginModalDialog(); - static void OSXEndModalDialog(); + void OSXBeginModalDialog(); + void OSXEndModalDialog(); + +#if wxOSX_USE_COCOA + bool OSXGetWorksWhenModal(); + void OSXSetWorksWhenModal(bool worksWhenModal); +#endif // implementation // -------------- @@ -89,6 +94,11 @@ protected: private: void Init(); + + static wxVector s_modalStack; +#if wxOSX_USE_COCOA + static wxVector s_modalWorksStack; +#endif }; #endif