summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-08 11:34:46 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-08 11:34:46 (GMT)
commit9585548e0c8e9888638122b776be2e37e92bd271 (patch)
treed06483faa59f6920ff46bd9a8276adb77860ed69
parente68d114c24b86c56fc9ddadb2b99dbbaf3445f23 (diff)
downloadtk-9585548e0c8e9888638122b776be2e37e92bd271.zip
tk-9585548e0c8e9888638122b776be2e37e92bd271.tar.gz
tk-9585548e0c8e9888638122b776be2e37e92bd271.tar.bz2
(cherry-pick) Fixed bug [3e3e25f483] - winbutton-1.[12] fails on Win7
-rw-r--r--tests/winButton.test8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/winButton.test b/tests/winButton.test
index 5bf6867..5e3dcfb 100644
--- a/tests/winButton.test
+++ b/tests/winButton.test
@@ -29,7 +29,9 @@ radiobutton .r -text Radiobutton
pack .l .b .c .r
update
-test winbutton-1.1 {TkpComputeButtonGeometry procedure} {testImageType win} {
+test winbutton-1.1 {TkpComputeButtonGeometry procedure} {testImageType win nonPortable} {
+ # nonPortable because of [3e3e25f483]: on Win7 first started with a high DPI screen
+ # the smallest size (i.e. 8) is not available for "MS Sans Serif" font
deleteWindows
image create test image1
image1 changed 0 0 0 0 60 40
@@ -46,7 +48,9 @@ test winbutton-1.1 {TkpComputeButtonGeometry procedure} {testImageType win} {
[winfo reqwidth .b3] [winfo reqheight .b3] \
[winfo reqwidth .b4] [winfo reqheight .b4]
} {68 48 70 50 90 52 90 52}
-test winbutton-1.2 {TkpComputeButtonGeometry procedure} win {
+test winbutton-1.2 {TkpComputeButtonGeometry procedure} {win nonPortable} {
+ # nonPortable because of [3e3e25f483]: on Win7 first started with a high DPI screen
+ # the smallest size (i.e. 8) is not available for "MS Sans Serif" font
deleteWindows
label .b1 -bitmap question -bd 3 -padx 0 -pady 2
button .b2 -bitmap question -bd 3 -padx 0 -pady 2