Merge 8.6

3 files changed, 12 insertions, 11 deletions

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 6a4890c..724f637 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -503,7 +503,7 @@ TkMacOSXGetNSImageWithTkImage(
 {
     Pixmap pixmap;
     NSImage *nsImage;
-    if (width == 0 | height == 0) {
+    if (width == 0 || height == 0) {
 	return nsImage = [[NSImage alloc] initWithSize:NSMakeSize(0,0)];
     }
     pixmap = Tk_GetPixmap(display, None, width, height, 0);
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index b3c1041..e3aed98 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -293,7 +293,7 @@ static unsigned	isFunctionKey(unsigned int code);
     NSString *str;
 
     str = ([aString isKindOfClass: [NSAttributedString class]]) ?
-        str = [aString string] : aString;
+        [aString string] : aString;
     len = [str length];
 
     if (NS_KEYLOG) {
@@ -396,7 +396,7 @@ static unsigned	isFunctionKey(unsigned int code);
     NSString *str;
 
     str = ([aString isKindOfClass: [NSAttributedString class]]) ?
-        str = [aString string] : aString;
+        [aString string] : aString;
 
     if (focusWin) {
 
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 7054d1f..52534ce 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -1409,8 +1409,10 @@ static void ButtonElementDraw(
     } else if (info.kind == kThemePushButton &&
 	       (state & TTK_STATE_PRESSED)) {
 	bounds.size.height += 2;
-	GradientFillRoundedRectangle(dc.context, bounds, 4,
-	    pressedPushButtonGradient, 2);
+	if ([NSApp macMinorVersion] > 8) {
+	    GradientFillRoundedRectangle(dc.context, bounds, 4,
+					 pressedPushButtonGradient, 2);
+	}
     } else {
 
         /*
@@ -1859,18 +1861,17 @@ static void ComboboxElementDraw(
     BEGIN_DRAWING(d)
     bounds.origin.y += 1;
     if (TkMacOSXInDarkMode(tkwin)) {
-	    bounds.size.height += 1;
+	bounds.size.height += 1;
 	DrawDarkButton(bounds, info.kind, state, dc.context);
-	} else if ([NSApp macMinorVersion] > 8) {
-	    if ((state & TTK_STATE_BACKGROUND) &&
-		!(state & TTK_STATE_DISABLED)) {
+    } else if ([NSApp macMinorVersion] > 8) {
+	if ((state & TTK_STATE_BACKGROUND) &&
+	    !(state & TTK_STATE_DISABLED)) {
 	    NSColor *background = [NSColor textBackgroundColor];
 	    CGRect innerBounds = CGRectInset(bounds, 1, 2);
 	    SolidFillRoundedRectangle(dc.context, innerBounds, 4, background);
 	}
-    ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation,
-		NULL);
     }
+    ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation, NULL);
     END_DRAWING
 }