Skip to content

Py3.8: allow NVDA scripts to again run when in a wx popup menu or message box. #12072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 1 commit into from
Feb 17, 2021
Merged

Py3.8: allow NVDA scripts to again run when in a wx popup menu or message box. #12072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions source/gui/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,21 @@ def initialize():
raise RuntimeError("GUI already initialized")
mainFrame = MainFrame()
wx.GetApp().SetTopWindow(mainFrame)
# In wxPython >= 4.1,
# wx.CallAfter no longer executes callbacks while NVDA's main thread is within apopup menu or message box.
# To work around this,
# Monkeypatch wx.CallAfter to
# post a WM_NULL message to our top-level window after calling the original CallAfter,
# which causes wx's event loop to wake up enough to execute the callback.
old_wx_CallAfter = wx.CallAfter

def wx_CallAfter_wrapper(func, *args, **kwargs):
old_wx_CallAfter(func, *args, **kwargs)
# mainFrame may be None as NVDA could be terminating.
topHandle = mainFrame.Handle if mainFrame else None
if topHandle:
winUser.PostMessage(topHandle, winUser.WM_NULL, 0, 0)
wx.CallAfter = wx_CallAfter_wrapper

def terminate():
import brailleViewer
Expand Down