diff options
| author | culler <culler> | 2020-07-24 21:21:47 (GMT) |
|---|---|---|
| committer | culler <culler> | 2020-07-24 21:21:47 (GMT) |
| commit | 9c3c347b22063ccdb5d7dc9d9bdffd69962f7844 (patch) | |
| tree | c437ecce8d5651de99870e65317728a95ccfa764 | |
| parent | a965e9c43e2e9889b4cb3581bc91221c087a7c25 (diff) | |
| download | tk-9c3c347b22063ccdb5d7dc9d9bdffd69962f7844.zip tk-9c3c347b22063ccdb5d7dc9d9bdffd69962f7844.tar.gz tk-9c3c347b22063ccdb5d7dc9d9bdffd69962f7844.tar.bz2 | |
Fix the build for Snow Leopard. Fix the fontchooser demo.
| -rw-r--r-- | library/demos/fontchoose.tcl | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXColor.c | 11 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 1 | ||||
| -rw-r--r-- | macosx/tkMacOSXKeyEvent.c | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/library/demos/fontchoose.tcl b/library/demos/fontchoose.tcl index 8b34377..b93928d 100644 --- a/library/demos/fontchoose.tcl +++ b/library/demos/fontchoose.tcl @@ -57,7 +57,7 @@ grid columnconfigure $f 0 -weight 1 grid rowconfigure $f 0 -weight 1 bind $w <Visibility> { bind %W <Visibility> {} - grid propagate %W.f 0 + grid propagate %W 0 } ## See Code / Dismiss buttons diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c index 51a28c5..5a06c39 100644 --- a/macosx/tkMacOSXColor.c +++ b/macosx/tkMacOSXColor.c @@ -273,16 +273,15 @@ GetEntryFromPixelCode( * appears to be harmless and stops the compiler warnings. */ - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 @interface NSColor(TkColor) +#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200 @property(class, strong, readonly) NSColor *linkColor; -@end -#else -@interface NSColor(TkColor) +#elif MAC_OS_X_VERSION_MAX_ALLOWED > 1080 @property(strong, readonly) NSColor *linkColor; -@end +#else +@property(assign, readonly) NSColor *linkColor; #endif +@end static NSColorSpace* sRGB = NULL; static CGFloat windowBackground[4] = diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index e75a63c..d3c4a0c 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -34,6 +34,7 @@ static char scriptPath[PATH_MAX + 1] = ""; @synthesize poolLock = _poolLock; @synthesize macOSVersion = _macOSVersion; @synthesize isDrawing = _isDrawing; +@synthesize needsToDraw = _needsToDraw; @end /* diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c index 572e318..014caa9 100644 --- a/macosx/tkMacOSXKeyEvent.c +++ b/macosx/tkMacOSXKeyEvent.c @@ -267,6 +267,8 @@ static NSUInteger textInputModifiers; @implementation TKContentView +@synthesize tkDirtyRect = _tkDirtyRect; +@synthesize tkNeedsDisplay = _tkNeedsDisplay;; /* * Implementation of the NSTextInputClient protocol. |