From dfe5c85f7cd640ceb9ed7cbeaf2d30c260f3fcb1 Mon Sep 17 00:00:00 2001
From: Hiroki Fujii <hiroki@efuji.jp>
Date: Mon, 24 Feb 2025 21:48:39 +0900
Subject: [PATCH] =?UTF-8?q?NVDA2025=E4=BB=A5=E9=99=8D=E3=81=AE=E3=83=A1?=
 =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=83=80=E3=82=A4=E3=82=A2?=
 =?UTF-8?q?=E3=83=AD=E3=82=B0=E5=A4=89=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dokutor_for_nvda/__init__.py              |  5 +++--
 .../globalPlugins/dokutor_for_nvda/compat.py  | 21 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 addon/globalPlugins/dokutor_for_nvda/compat.py

diff --git a/addon/globalPlugins/dokutor_for_nvda/__init__.py b/addon/globalPlugins/dokutor_for_nvda/__init__.py
index 3840d9c..d16598e 100644
--- a/addon/globalPlugins/dokutor_for_nvda/__init__.py
+++ b/addon/globalPlugins/dokutor_for_nvda/__init__.py
@@ -18,6 +18,7 @@
 from .constants import *
 from . import updater
 from . import converter
+from .compat import messageBox
 
 
 try:
@@ -116,14 +117,14 @@ def toggleEnableOnStartup(self, evt):
         self.setEnableOnStartupSetting(changed)
         msg = _("NVDA起動時に、自動で理療科用読み辞書を適用します。") if changed is True else _("NVDA起動時は、通常の読み辞書を利用します。")
         self.enableOnStartupToggleItem.SetItemLabel(self.enableOnStartupToggleString())
-        wx.MessageBox(msg, _("設定変更完了"))
+        messageBox(msg, _("設定変更完了"))
     
     def toggleUpdateCheck(self, evt):
         changed = not self.getUpdateCheckSetting()
         self.setUpdateCheckSetting(changed)
         msg = _("NVDA起動時に、自動でDFNのアップデートを確認します。") if changed is True else _("NVDA起動時に、DFNのアップデートを確認しません。")
         self.updateCheckToggleItem.SetItemLabel(self.updateCheckToggleString())
-        wx.MessageBox(msg, _("設定変更完了"))
+        messageBox(msg, _("設定変更完了"))
 
     def performUpdateCheck(self, evt):
         updater.AutoUpdateChecker().autoUpdateCheck(mode=updater.MANUAL)
diff --git a/addon/globalPlugins/dokutor_for_nvda/compat.py b/addon/globalPlugins/dokutor_for_nvda/compat.py
new file mode 100644
index 0000000..c300224
--- /dev/null
+++ b/addon/globalPlugins/dokutor_for_nvda/compat.py
@@ -0,0 +1,21 @@
+import wx
+import gui
+import versionInfo
+
+def isCompatibleWith2025():
+    return versionInfo.version_year >= 2025
+
+def messageBox(message, title):
+    if isCompatibleWith2025():
+        gui.message.MessageDialog.alert(message, title)
+    else:
+        gui.messageBox(message, title, style=wx.CENTER)
+
+
+def yesno(message, title):
+    if isCompatibleWith2025():
+        dlg = gui.message.MessageDialog(None, message, title, buttons=gui.message.DefaultButtonSet.YES_NO)
+        return dlg.ShowModal() == gui.message.ReturnCode.YES
+    else:
+        return gui.messageBox(message, title, style=wx.CENTER | wx.YES | wx.NO | wx.ICON_INFORMATION) == wx.YES
+