Fix compile error in quasi-modal wxWidgets patch.

This commit is contained in:
Jeff Young 2018-01-19 10:51:43 +00:00 committed by jean-pierre charras
parent 388d07a808
commit 90cc896af2
1 changed files with 18 additions and 3 deletions

View File

@ -1,15 +1,30 @@
From 0cc169ec53f5eb50e6f1e77c2f73f4631561d574 Mon Sep 17 00:00:00 2001 From f725afdcbd4168fce3d1e8f952fe55b03cdf8a7e Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie> From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 9 Jan 2018 12:04:20 +0000 Date: Tue, 9 Jan 2018 12:04:20 +0000
Subject: [PATCH 1/1] Backport OSX disabled-window fixes from master. Subject: [PATCH 1/2] Backport OSX disabled-window fixes from master.
Also adds ReparentQuasiModal() which is required for Kicad Also adds ReparentQuasiModal() which is required for Kicad
quasi-modal dialogs. quasi-modal dialogs.
--- ---
include/wx/osx/dialog.h | 3 +++
src/osx/cocoa/dialog.mm | 12 ++++++++++++ src/osx/cocoa/dialog.mm | 12 ++++++++++++
src/osx/cocoa/window.mm | 13 ++++++++++++- src/osx/cocoa/window.mm | 13 ++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-) 3 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index 3b0b724fb8..5beda35130 100644
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -59,6 +59,9 @@ public:
// may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
+ // hack to keep window behind quasi-modal dialog from being fronted
+ void ReparentQuasiModal();
+
static bool OSXHasModalDialogsOpen();
static void OSXBeginModalDialog();
static void OSXEndModalDialog();
diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm
index 8b1e48f1b4..c6b508013e 100644 index 8b1e48f1b4..c6b508013e 100644
--- a/src/osx/cocoa/dialog.mm --- a/src/osx/cocoa/dialog.mm