From 9d2eaf34f27c46f7e9f5d6b33cb21a4d3c73f212 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 18 Oct 2019 18:34:24 +0100
Subject: [PATCH] RF: Relax Platform.haveGui requirements (temporarily, I
hope!)
---
fsl/utils/platform.py | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/fsl/utils/platform.py b/fsl/utils/platform.py
index 04ffb98d6..6d3d31eda 100644
--- a/fsl/utils/platform.py
+++ b/fsl/utils/platform.py
@@ -163,9 +163,27 @@ class Platform(notifier.Notifier):
try:
import wx
app = wx.GetApp()
+
+ # TODO Previously this conditional
+ # also used app.IsMainLoopRunning()
+ # to check that the wx main loop
+ # was running. But this doesn't
+ # suit situations where a non-main
+ # event loop is running (e.g. when
+ # the event loop is being run by
+ # IPython).
+ #
+ # In c++ wx, there is the
+ # wx.App.UsesEventLoop method, but
+ # this is not presently exposed to
+ # Python code.
+ #
+ # So this constraint has been
+ # (hopefully) temporarily relaxed
+ # until UsesEventLoop can be called
+ # from Python.
return (self.canHaveGui and
- app is not None and
- app.IsMainLoopRunning())
+ app is not None)
except ImportError:
return False
--
GitLab