[3.15] gh-82830: Improve tkinter messagebox docstrings and cursor documentation ...

Document Windows cursor files (gh-99089).
(cherry picked from commit ea7f64a65cb52b8b720cbf5d590c2cf89de8d407)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

diff --git a/Doc/library/tkinter.messagebox.rst b/Doc/library/tkinter.messagebox.rst
index b4529e2329ebfbc2992fce58aaf98f223c4e0fd1..7fd561ade2f8bc5556757eab1c9e9a3db98b43c7 100644 (file)
--- a/Doc/library/tkinter.messagebox.rst
+++ b/Doc/library/tkinter.messagebox.rst
@@ -113,7 +113,7 @@ Common message box styles and layouts include but are not limited to:
 .. function:: askretrycancel(title=None, message=None, **options)
 
    Ask if operation should be retried. Shows buttons :data:`RETRY` and :data:`CANCEL`.
-   Return ``True`` if the answer is yes and ``False`` otherwise.
+   Return ``True`` if the answer is retry and ``False`` otherwise.
 
 .. function:: askyesno(title=None, message=None, **options)
 

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index ec598976971fe6b9cfc9efa830bb2726b957285e..c9c19c21e7358c5817fc452aa6a714e6ca8fe362 100644 (file)
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -770,6 +770,8 @@ cursor
    The standard X cursor names from :file:`cursorfont.h` can be used, without the
    ``XC_`` prefix.  For example to get a hand cursor (``XC_hand2``), use the
    string ``"hand2"``.  You can also specify a bitmap and mask file of your own.
+   On Windows a cursor file (:file:`.cur` or :file:`.ani`) may be used directly,
+   giving its path preceded with an ``@``, as in ``"@C:/cursors/bart.ani"``.
    See page 179 of Ousterhout's book.
 
 distance

diff --git a/Lib/tkinter/messagebox.py b/Lib/tkinter/messagebox.py
index 5f0343b660c68c5a884f38ca78291caf14936231..dd2816cffb1140ba3c5c9db668e89a1b64373080 100644 (file)
--- a/Lib/tkinter/messagebox.py
+++ b/Lib/tkinter/messagebox.py
@@ -99,24 +99,24 @@ def showerror(title=None, message=None, **options):
 
 
 def askquestion(title=None, message=None, **options):
-    "Ask a question"
+    "Ask a question; return the symbolic name of the selected button"
     return _show(title, message, QUESTION, YESNO, **options)
 
 
 def askokcancel(title=None, message=None, **options):
-    "Ask if operation should proceed; return true if the answer is ok"
+    "Ask if operation should proceed; return True if the answer is ok"
     s = _show(title, message, QUESTION, OKCANCEL, **options)
     return s == OK
 
 
 def askyesno(title=None, message=None, **options):
-    "Ask a question; return true if the answer is yes"
+    "Ask a question; return True if the answer is yes"
     s = _show(title, message, QUESTION, YESNO, **options)
     return s == YES
 
 
 def askyesnocancel(title=None, message=None, **options):
-    "Ask a question; return true if the answer is yes, None if cancelled."
+    "Ask a question; return True if the answer is yes, None if cancelled"
     s = _show(title, message, QUESTION, YESNOCANCEL, **options)
     # s might be a Tcl index object, so convert it to a string
     s = str(s)
@@ -126,7 +126,7 @@ def askyesnocancel(title=None, message=None, **options):
 
 
 def askretrycancel(title=None, message=None, **options):
-    "Ask if operation should be retried; return true if the answer is yes"
+    "Ask if operation should be retried; return True if the answer is retry"
     s = _show(title, message, WARNING, RETRYCANCEL, **options)
     return s == RETRY