diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 11:03:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-09 11:03:19 (GMT) |
| commit | f6708dbca5db2d4fd3514b156f8fd2ee059e6cb2 (patch) | |
| tree | 7147654115891088bcce4f8dddca3c2928f8ec96 | |
| parent | 971c05857123c01f58defd978870102e6f3a28aa (diff) | |
| download | tk-f6708dbca5db2d4fd3514b156f8fd2ee059e6cb2.zip tk-f6708dbca5db2d4fd3514b156f8fd2ee059e6cb2.tar.gz tk-f6708dbca5db2d4fd3514b156f8fd2ee059e6cb2.tar.bz2 | |
Two more failsOnXQuarz marks. Fix possible compiler warning when HAVE_XKBKEYCODETOKEYSYM is not defined
| -rw-r--r-- | tests/send.test | 3 | ||||
| -rw-r--r-- | tests/ttk/entry.test | 3 | ||||
| -rw-r--r-- | unix/tkUnixEvent.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/send.test b/tests/send.test index c75f428..ccf3eab 100644 --- a/tests/send.test +++ b/tests/send.test @@ -16,6 +16,7 @@ tcltest::loadTestedCommands testConstraint xhost [llength [auto_execok xhost]] testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}] +testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] # Compute a script that will load Tk into a child interpreter. @@ -297,7 +298,7 @@ test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver te "if 1 {open bogus_file_name}" invoked from within "send t_s_1 {if 1 {open bogus_file_name}}"} {POSIX ENOENT {no such file or directory}}} -test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu} { +test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu failsOnXQuarz} { testsend prop root InterpRegistry "10234 bogus\n" set result [list [catch {send bogus bogus command} msg] $msg] winfo interps diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test index 293bfe1..384f297 100644 --- a/tests/ttk/entry.test +++ b/tests/ttk/entry.test @@ -8,6 +8,7 @@ namespace import -force tcltest::* loadTestedCommands testConstraint failsOnUbuntu [expr {![info exists ::env(CI)] || ![string match Linux $::tcl_platform(os)]}] +testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] variable scrollInfo proc scroll args { @@ -77,7 +78,7 @@ test entry-2.1 "Create entry before scrollbar" -body { -expand false -fill x } -cleanup {destroy .te .tsb} -test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -constraints failsOnUbuntu -body { +test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -constraints {failsOnUbuntu failsOnXQuarz} -body { pack [ttk::entry .te -xscrollcommand [list .tsb set]] \ -expand true -fill both .te insert end [string repeat "abc" 50] diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 4d0b9be..e424bb7 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -15,7 +15,7 @@ #ifdef HAVE_XKBKEYCODETOKEYSYM # include <X11/XKBlib.h> #else -# define XkbOpenDisplay(D,V,E,M,m,R) ((V),(E),(M),(m),(R),(NULL)) +# define XkbOpenDisplay(D,V,E,M,m,R) (((void)D),((void)V),((void)E),((void)M),((void)m),((void)R),(NULL)) #endif /* |