Merged core-8-5-branch

2 files changed, 34 insertions, 92 deletions

diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 38115ee..7b7892e 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -7,8 +7,6 @@
  * Copyright (c) 1996 by Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
-*  Copyright (c) 2014 Marc Culler.
- * Copyright (c) 2014 Kevin Walzer/WordTech Commununications LLC.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -22,7 +20,7 @@
 #define TK_MAC_DEBUG_SCROLLBAR
 #endif
 */
- 
+
 NSRect                  TkMacOSXGetScrollFrame(TkScrollbar *scrlPtr);
 
 /*
@@ -33,103 +31,52 @@ NSRect                  TkMacOSXGetScrollFrame(TkScrollbar *scrlPtr);
  * aware of the state of its Tk parent.  This subclass overrides the drawRect
  * method so that it will not draw itself if the widget is completely outside
  * of its container.
- *
- * Custom drawing of the knob seems to work around the flickering visible after  
- * private API's were removed. Based on technique outlined at 
- * http://stackoverflow.com/questions/1604682/nsscroller-
- * graphical-glitches-lag. Only supported on 10.7 and above.
  */
- 
 
 @interface TkNSScroller: NSScroller
 -(void) drawRect:(NSRect)dirtyRect;
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
--(BOOL) isHorizontal;
--(void) drawKnob;
-- (void)drawArrow:(NSScrollerArrow)arrow highlightPart:(int)flag;
-- (void)drawKnobSlotInRect:(NSRect)rect highlight:(BOOL)highlight;
-#endif
+
 @end
 
 @implementation TkNSScroller
 
-
-- (void)drawRect:(NSRect)dirtyRect
-{
-    NSInteger tag = [self tag];
-    if ( tag != -1) {
-	TkScrollbar *scrollPtr = (TkScrollbar *)tag;
-	MacDrawable* macWin = (MacDrawable *)scrollPtr;
-	Tk_Window tkwin = scrollPtr->tkwin;
-	NSRect Tkframe = TkMacOSXGetScrollFrame(scrollPtr);
-	/* Do not draw if the widget is misplaced or unmapped. */
-	if ( NSIsEmptyRect(Tkframe) ||
-	     ! macWin->winPtr->flags & TK_MAPPED ||
-	     ! NSEqualRects(Tkframe, [self frame])
-	     ) {
-	    return;
-	}
-
-	/*
-	 * Do not draw if the widget is completely outside of its parent.
-	 */
-	if (tkwin) {
-	    int parent_height = Tk_Height(Tk_Parent(tkwin));
-	    int widget_height = Tk_Height(tkwin);
-	    int y = Tk_Y(tkwin);
-	    if ( y > parent_height || y + widget_height < 0 ) {
+    - (void)drawRect:(NSRect)dirtyRect
+    {
+	NSInteger tag = [self tag];
+	if ( tag != -1) {
+	    TkScrollbar *scrollPtr = (TkScrollbar *)tag;
+	    MacDrawable* macWin = (MacDrawable *)scrollPtr;
+	    Tk_Window tkwin = scrollPtr->tkwin;
+	    NSRect Tkframe = TkMacOSXGetScrollFrame(scrollPtr);
+	    /* Do not draw if the widget is misplaced or unmapped. */
+	    if ( NSIsEmptyRect(Tkframe) || 
+		 ! macWin->winPtr->flags & TK_MAPPED ||
+		 ! NSEqualRects(Tkframe, [self frame]) 
+		 ) {
 		return;
 	    }
 
-	    int parent_width = Tk_Width(Tk_Parent(tkwin));
-	    int widget_width = Tk_Width(tkwin);
-	    int x = Tk_X(tkwin);
-	    if (x > parent_width || x + widget_width < 0) {
-		return;
+	    /*
+	     * Do not draw if the widget is completely outside of its parent.
+	     */
+	    if (tkwin) {
+		int parent_height = Tk_Height(Tk_Parent(tkwin));
+		int widget_height = Tk_Height(tkwin);
+		int y = Tk_Y(tkwin);
+		if ( y > parent_height || y + widget_height < 0 ) {
+		    return;
+		}
+
+		int parent_width = Tk_Width(Tk_Parent(tkwin));
+		int widget_width = Tk_Width(tkwin);
+		int x = Tk_X(tkwin);
+		if (x > parent_width || x + widget_width < 0) {
+		    return;
+		}
 	    }
 	}
+	[super drawRect:dirtyRect];
     }
-    [super drawRect:dirtyRect];
-}
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-- (BOOL)isVertical {
-    NSRect bounds = [self bounds];
-    return NSWidth(bounds) < NSHeight (bounds);
-}
-
-
-- (void)drawKnob
-{
-    NSRect knobRect = [self rectForPart:NSScrollerKnob];
-    
-    if ([self isVertical]) {
-	NSRect newRect = NSMakeRect(knobRect.origin.x + 3, knobRect.origin.y, knobRect.size.width - 6, knobRect.size.height);
-    NSBezierPath  *scrollerPath = [NSBezierPath bezierPathWithRoundedRect:newRect xRadius:4 yRadius:4];
- 
-    [[NSColor lightGrayColor] set];
-	[scrollerPath fill];
-    } else {
-	NSRect newRect = NSMakeRect(knobRect.origin.x, knobRect.origin.y + 3, knobRect.size.width, knobRect.size.height - 6);
-	NSBezierPath  *scrollerPath = [NSBezierPath bezierPathWithRoundedRect:newRect xRadius:4 yRadius:4];
- 
-        [[NSColor lightGrayColor] set];
-	[scrollerPath fill];
-    }
-       
-}
-
-- (void)drawArrow:(NSScrollerArrow)arrow highlightPart:(int)flag
-{
-    // We don't want arrows
-}
-
-- (void)drawKnobSlotInRect:(NSRect)rect highlight:(BOOL)highlight
-{
-  
-}
-
-#endif
 
 @end
 
@@ -344,7 +291,7 @@ TkpCreateScrollbar(
 
     scrollPtr->scroller = nil;
     Tk_CreateEventHandler(tkwin, StructureNotifyMask|FocusChangeMask|
-	    ActivateMask|ExposureMask, ScrollbarEventProc, (ClientData) scrollPtr);
+			  ActivateMask|ExposureMask, ScrollbarEventProc, (ClientData) scrollPtr);
     return (TkScrollbar *) scrollPtr;
 }
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index c49fe15..0f1e2be 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -954,11 +954,6 @@ ExposeRestrictProc(
     [super setFrameSize:newSize];
 }
 
-- (void) setNeedsDisplayInRect: (NSRect) invalidRect
-{
-    [super setNeedsDisplayInRect:invalidRect];
-}
-
 - (BOOL) isOpaque
 {
     NSWindow *w = [self window];