bpo-33987: Use master ttk Frame for IDLE config dialog (GH-22943) · python/cpython@2d49389 (original) (raw)

`@@ -67,7 +67,6 @@ def init(self, parent, title='', *, _htest=False, _utest=False):

`

67

67

`if not _utest:

`

68

68

`self.withdraw()

`

69

69

``

70

``

`-

self.configure(borderwidth=5)

`

71

70

`self.title(title or 'IDLE Preferences')

`

72

71

`x = parent.winfo_rootx() + 20

`

73

72

`y = parent.winfo_rooty() + (30 if not _htest else 150)

`

`@@ -97,6 +96,7 @@ def create_widgets(self):

`

97

96

`"""Create and place widgets for tabbed dialog.

`

98

97

``

99

98

` Widgets Bound to self:

`

``

99

`+

frame: encloses all other widgets

`

100

100

` note: Notebook

`

101

101

` highpage: HighPage

`

102

102

` fontpage: FontPage

`

`@@ -109,7 +109,9 @@ def create_widgets(self):

`

109

109

` load_configs: Load pages except for extensions.

`

110

110

` activate_config_changes: Tell editors to reload.

`

111

111

` """

`

112

``

`-

self.note = note = Notebook(self)

`

``

112

`+

self.frame = frame = Frame(self, padding="5px")

`

``

113

`+

self.frame.grid(sticky="nwes")

`

``

114

`+

self.note = note = Notebook(frame)

`

113

115

`self.highpage = HighPage(note)

`

114

116

`self.fontpage = FontPage(note, self.highpage)

`

115

117

`self.keyspage = KeysPage(note)

`

`@@ -148,7 +150,7 @@ def create_action_buttons(self):

`

148

150

`padding_args = {}

`

149

151

`else:

`

150

152

`padding_args = {'padding': (6, 3)}

`

151

``

`-

outer = Frame(self, padding=2)

`

``

153

`+

outer = Frame(self.frame, padding=2)

`

152

154

`buttons_frame = Frame(outer, padding=2)

`

153

155

`self.buttons = {}

`

154

156

`for txt, cmd in (

`

`@@ -687,7 +689,7 @@ class HighPage(Frame):

`

687

689

``

688

690

`def init(self, master):

`

689

691

`super().init(master)

`

690

``

`-

self.cd = master.master

`

``

692

`+

self.cd = master.winfo_toplevel()

`

691

693

`self.style = Style(master)

`

692

694

`self.create_page_highlight()

`

693

695

`self.load_theme_cfg()

`

`@@ -1346,7 +1348,7 @@ class KeysPage(Frame):

`

1346

1348

``

1347

1349

`def init(self, master):

`

1348

1350

`super().init(master)

`

1349

``

`-

self.cd = master.master

`

``

1351

`+

self.cd = master.winfo_toplevel()

`

1350

1352

`self.create_page_keys()

`

1351

1353

`self.load_key_cfg()

`

1352

1354

``