mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
bpo-43655: Tkinter and IDLE dialog windows are now recognized as dialogs by window managers on macOS and X Window (#25187)
This commit is contained in:
parent
8cc3cfa8af
commit
3bb3fb3be0
7 changed files with 25 additions and 7 deletions
|
@ -4,6 +4,7 @@ Dialog for building Tkinter accelerator key bindings
|
|||
from tkinter import Toplevel, Listbox, StringVar, TclError
|
||||
from tkinter.ttk import Frame, Button, Checkbutton, Entry, Label, Scrollbar
|
||||
from tkinter import messagebox
|
||||
from tkinter.simpledialog import _setup_dialog
|
||||
import string
|
||||
import sys
|
||||
|
||||
|
@ -63,6 +64,7 @@ class GetKeysDialog(Toplevel):
|
|||
self.resizable(height=False, width=False)
|
||||
self.title(title)
|
||||
self.transient(parent)
|
||||
_setup_dialog(self)
|
||||
self.grab_set()
|
||||
self.protocol("WM_DELETE_WINDOW", self.cancel)
|
||||
self.parent = parent
|
||||
|
|
|
@ -28,6 +28,7 @@ from tkinter import Toplevel, StringVar, BooleanVar, W, E, S
|
|||
from tkinter.ttk import Frame, Button, Entry, Label, Checkbutton
|
||||
from tkinter import filedialog
|
||||
from tkinter.font import Font
|
||||
from tkinter.simpledialog import _setup_dialog
|
||||
|
||||
class Query(Toplevel):
|
||||
"""Base class for getting verified answer from a user.
|
||||
|
@ -60,13 +61,8 @@ class Query(Toplevel):
|
|||
if not _utest: # Otherwise fail when directly run unittest.
|
||||
self.grab_set()
|
||||
|
||||
windowingsystem = self.tk.call('tk', 'windowingsystem')
|
||||
if windowingsystem == 'aqua':
|
||||
try:
|
||||
self.tk.call('::tk::unsupported::MacWindowStyle', 'style',
|
||||
self._w, 'moveableModal', '')
|
||||
except:
|
||||
pass
|
||||
_setup_dialog(self)
|
||||
if self._windowingsystem == 'aqua':
|
||||
self.bind("<Command-.>", self.cancel)
|
||||
self.bind('<Key-Escape>', self.cancel)
|
||||
self.protocol("WM_DELETE_WINDOW", self.cancel)
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
from tkinter import Toplevel
|
||||
from tkinter.ttk import Frame, Entry, Label, Button, Checkbutton, Radiobutton
|
||||
from tkinter.simpledialog import _setup_dialog
|
||||
|
||||
|
||||
class SearchDialogBase:
|
||||
|
@ -83,6 +84,7 @@ class SearchDialogBase:
|
|||
top.protocol("WM_DELETE_WINDOW", self.close)
|
||||
top.wm_title(self.title)
|
||||
top.wm_iconname(self.icon)
|
||||
_setup_dialog(top)
|
||||
self.top = top
|
||||
self.frame = Frame(top, padding="5px")
|
||||
self.frame.grid(sticky="nwes")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue