Commit7e63a1d

authored

Merge pull request#21000 from meeseeksmachine/auto-backport-of-pr-20997-on-v3.5.x

Backport PR#20997 on branch v3.5.x (Fix ToolManager + TextBox support.)

2 parents01c9cfd +f36d182 commit7e63a1dCopy full SHA for 7e63a1d

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,11 @@ def test_CheckButtons():`
`619`	`619`	`check.disconnect(cid)`
`620`	`620`
`621`	`621`
`622`		`-deftest_TextBox():`
	`622`	`+@pytest.mark.parametrize("toolbar", ["none","toolbar2","toolmanager"])`
	`623`	`+deftest_TextBox(toolbar):`
	`624`	`+# Avoid "toolmanager is provisional" warning.`
	`625`	`+dict.__setitem__(plt.rcParams,"toolbar",toolbar)`
	`626`	`+`
`623`	`627`	`fromunittest.mockimportMock`
`624`	`628`	`submit_event=Mock()`
`625`	`629`	`text_change_event=Mock()`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1287,7 +1287,7 @@ def begin_typing(self, x):`
`1287`	`1287`	`# If using toolmanager, lock keypresses, and plan to release the`
`1288`	`1288`	`# lock when typing stops.`
`1289`	`1289`	`toolmanager.keypresslock(self)`
`1290`		`-stack.push(toolmanager.keypresslock.release,self)`
	`1290`	`+stack.callback(toolmanager.keypresslock.release,self)`
`1291`	`1291`	`else:`
`1292`	`1292`	`# If not using toolmanager, disable all keypress-related rcParams.`
`1293`	`1293`	`# Avoid spurious warnings if keymaps are getting deprecated.`

Comments

(0)