diff options
| author | culler <culler> | 2018-10-29 03:17:44 (GMT) |
|---|---|---|
| committer | culler <culler> | 2018-10-29 03:17:44 (GMT) |
| commit | a2d3cbf84f7c94437da6df6e681495ac03b0218f (patch) | |
| tree | 185e7cd338b5ae3c9bd13814a4f57c8144e29a5f /macosx | |
| parent | 6bb10563aa31c100460f9c956fab0b4a29bba429 (diff) | |
| download | tk-a2d3cbf84f7c94437da6df6e681495ac03b0218f.zip tk-a2d3cbf84f7c94437da6df6e681495ac03b0218f.tar.gz tk-a2d3cbf84f7c94437da6df6e681495ac03b0218f.tar.bz2 | |
Remove an extraneous #ifdef and correct the spelling of a #define constant.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXPrivate.h | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h index 24108a6..197879f 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -348,10 +348,8 @@ VISIBILITY_HIDDEN @end @interface NSWindow(TKWm) -#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 - (NSPoint) tkConvertPointToScreen:(NSPoint)point; - (NSPoint) tkConvertPointFromScreen:(NSPoint)point; -#endif @end #pragma mark NSMenu & NSMenuItem Utilities diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 0e30d28..a3f2043 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -6562,7 +6562,7 @@ TkMacOSXMakeFullscreen( /*For 10.13 and later add a button for exiting Fullscreen.*/ if ([NSApp macMinorVersion] > 12) { -#if __MAC_OSX_VERSION_MAX_ALLOWED > 1090 +#if MAC_OS_X_VERSION_MAX_ALLOWED > 1090 exitFullScreen = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength] retain]; NSImage *exitIcon = [NSImage imageNamed:@"NSExitFullScreenTemplate"]; |