diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-06 16:19:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-06 16:19:44 (GMT) |
| commit | 235c3428d9a76bc94aca900b569280c80215b9c2 (patch) | |
| tree | d6d757f2a2ef827d88e3fc60779e62152c4b53ff | |
| parent | 95711301992d821562200d4f7843816c2c83add4 (diff) | |
| parent | 60ddddfc7cd740b62a5afc49c45402d58d733feb (diff) | |
| download | tk-235c3428d9a76bc94aca900b569280c80215b9c2.zip tk-235c3428d9a76bc94aca900b569280c80215b9c2.tar.gz tk-235c3428d9a76bc94aca900b569280c80215b9c2.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index d990c81..3e88dfe 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -309,7 +309,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification; observe(NSWindowWillStartLiveResizeNotification, windowLiveResize:); observe(NSWindowDidEndLiveResizeNotification, windowLiveResize:); -#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 1070) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 observe(NSWindowDidEnterFullScreenNotification, windowEnteredFullScreen:); observe(NSWindowDidExitFullScreenNotification, windowExitedFullScreen:); #endif @@ -1009,6 +1009,7 @@ ConfigureRestrictProc( return NO; } +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - (void) viewDidChangeBackingProperties { @@ -1021,6 +1022,7 @@ ConfigureRestrictProc( self.layer.contentsScale = self.window.screen.backingScaleFactor; } +#endif - (void) addTkDirtyRect: (NSRect) rect { diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 0ee307d..b1bfc5e 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -409,7 +409,7 @@ static void RemoveTransient(TkWindow *winPtr); } } -#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 101200) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 - (void)toggleTabBar:(id)sender { TkWindow *winPtr = TkMacOSXGetTkWindow(self); @@ -1423,7 +1423,7 @@ WmSetAttribute( return TCL_ERROR; } if (boolean != (([macWindow styleMask] & NSFullScreenWindowMask) != 0)) { -#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 1070) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 [macWindow toggleFullScreen:macWindow]; #else TKLog(@"The fullscreen attribute is ignored on this system."); @@ -5976,8 +5976,7 @@ WmWinTabbingId( (void) objc; (void) objv; return TCL_OK; -#endif -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 +#else Tcl_Obj *result = NULL; NSString *idString; NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window); @@ -6014,8 +6013,8 @@ WmWinTabbingId( } return TCL_OK; } -#endif return TCL_ERROR; +#endif } /* @@ -6062,8 +6061,7 @@ WmWinAppearance( (void) objc; (void) objv; return TCL_OK; -#endif -#if MAC_OS_X_VERSION_MAX_ALLOWED > 1090 +#else static const char *const appearanceStrings[] = { "aqua", "auto", "darkaqua", NULL }; @@ -6123,8 +6121,6 @@ WmWinAppearance( } Tcl_SetObjResult(interp, result); return TCL_OK; -#else // MAC_OS_X_VERSION_MAX_ALLOWED > 1090 - return TCL_ERROR; #endif } |