Merge da8bc4b into 8ec1116

SaschaCowley · web-flow · commit 3ab8b6cd966b · 2025-01-28T12:39:21.000+11:00
diff --git a/source/gui/message.py b/source/gui/message.py
@@ -5,6 +5,7 @@
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
+from dataclasses import dataclass
 import threading
 import time
 import warnings
@@ -154,8 +155,13 @@ def displayError(self, parentWindow: wx.Window):
 		)
 
 
+@dataclass(frozen=True)
+class Payload:
+	"""Payload of information to pass to message dialog callbacks."""
+
+
 # TODO: Change to type statement when Python 3.12 or later is in use.
-_Callback_T: TypeAlias = Callable[[], Any]
+_Callback_T: TypeAlias = Callable[[Payload], Any]
 
 
 class _Missing_Type:
@@ -1139,7 +1145,8 @@ def _executeCommand(
 		if callback is not None:
 			if close:
 				self.Hide()
-			callback()
+			payload = Payload()
+			callback(payload)
 		if close:
 			self.SetReturnCode(returnCode)
 			self.Close()
diff --git a/source/synthDrivers/sapi4.py b/source/synthDrivers/sapi4.py
@@ -486,7 +486,7 @@ def _mmDeviceEndpointIdToWaveOutId(targetEndpointId: str) -> int:
 def _sapi4DeprecationWarning(synth: SynthDriver, audioOutputDevice: str, isFallback: bool):
 	"""A synthChanged event handler to alert the user about the deprecation of SAPI4."""
 
-	def setShown():
+	def setShown(payload: gui.message.Payload):
 		synth._hasWarningBeenShown = True
 		synth.saveSettings()
 
@@ -509,7 +509,7 @@ def impl():
 		).addHelpButton(
 			# Translators: A button in a dialog.
 			label=_("Open user guide"),
-			callback=lambda: gui.contextHelp.showHelp("SupportedSpeechSynths"),
+			callback=lambda payload: gui.contextHelp.showHelp("SupportedSpeechSynths"),
 		).Show()
 
 	if (not isFallback) and (synth.name == "sapi4") and (not getattr(synth, "_hasWarningBeenShown", False)):
