diff options
| -rw-r--r-- | .github/workflows/mac-build.yml | 2 | ||||
| -rw-r--r-- | generic/tkWindow.c | 21 | ||||
| -rw-r--r-- | tests/font.test | 13 | ||||
| -rw-r--r-- | tests/unixWm.test | 1 | ||||
| -rw-r--r-- | unix/tkUnix.c | 2 |
5 files changed, 11 insertions, 28 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 7f07669..d7fd4ba 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -14,7 +14,7 @@ env: ERROR_ON_FAILURES: 1 jobs: xcode: - runs-on: macos-12 + runs-on: macos-14 defaults: run: shell: bash diff --git a/generic/tkWindow.c b/generic/tkWindow.c index c411bd3..85b5a0b 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -1755,26 +1755,6 @@ Tk_DestroyWindow( *-------------------------------------------------------------- */ -static void SendEnterLeaveForMap( - Tk_Window tkwin) -{ -#if defined(MAC_OSX_TK) || defined(_WIN32) - int x, y; - unsigned int state; - Tk_Window pointerWin; - - if (displayBeingClosed) { - return; - } - XQueryPointer(Tk_Display(tkwin), None, NULL, NULL, &x, &y, - NULL, NULL, &state); - pointerWin = Tk_CoordsToWindow(x, y, tkwin); - if (pointerWin == tkwin) { - Tk_UpdatePointer(tkwin, x, y, state); - } -#endif -} - void Tk_MapWindow( Tk_Window tkwin) /* Token for window to map. */ @@ -1814,7 +1794,6 @@ Tk_MapWindow( event.xmap.window = winPtr->window; event.xmap.override_redirect = winPtr->atts.override_redirect; Tk_HandleEvent(&event); - SendEnterLeaveForMap(tkwin); } /* diff --git a/tests/font.test b/tests/font.test index 4a264f8..5ceb1ee 100644 --- a/tests/font.test +++ b/tests/font.test @@ -2427,15 +2427,15 @@ test font-47.2 {Bug 3049518 - Canvas} -body { set twidth [font measure MyFont $text] set theight [font metrics MyFont -linespace] set circid [$c create polygon \ - 15 15 \ - [expr {15 + $twidth}] 15 \ - [expr {15 + $twidth}] [expr {15 + $theight}] \ - 15 [expr {15 + $theight}] \ - -width 1 -joinstyle round -smooth true -fill {} -outline blue] + 15 15 \ + [expr {15 + $twidth}] 15 \ + [expr {15 + $twidth}] [expr {15 + $theight}] \ + 15 [expr {15 + $theight}] \ + -width 1 -joinstyle round -smooth true -fill {} -outline blue] pack $c -fill both -expand 1 -side top update - # Lamda test functions + # Lambda test functions set circle_text {{w user_data text circ} { if {[winfo class $w] ne "Canvas"} { puts "Wrong widget type: $w" @@ -2461,6 +2461,7 @@ test font-47.2 {Bug 3049518 - Canvas} -body { apply $circle_text $c FontChanged $textid $circid update bind $c <<TkWorldChanged>> [list apply $circle_text %W %d $textid $circid] + update idletasks # Begin test: set results {} diff --git a/tests/unixWm.test b/tests/unixWm.test index 65561d4..e286027 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -105,6 +105,7 @@ foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" { set i 1 foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" { test unixWm-3.$i {moving window while iconified} unix { + update wm iconify .t update idletasks wm geom .t $geom diff --git a/unix/tkUnix.c b/unix/tkUnix.c index f933cd2..4924728 100644 --- a/unix/tkUnix.c +++ b/unix/tkUnix.c @@ -130,6 +130,8 @@ Tk_UpdatePointer( *---------------------------------------------------------------------- */ +extern int XUnionRegion(Region srca, Region srcb, Region dr_return); + void TkpCopyRegion( TkRegion dst, |