From b598f1d55d8f6a4aefb4d53d8639f8f04bf94cf2 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Thu, 2 Sep 1999 17:02:27 +0000
Subject: 1999-09-01  Jeff Hobbs  <hobbs@scriptics.com>

	* win/tkWinDraw.c:
	* unix/tkUnixDraw.c: fixed header style for TkpDrawHighlightBorder
	* generic/tkCanvas.c: fixed GC error (bg <> fg) in tkCanvas.c
	(from code added to support TkpDrawHighlightBorder) [Bug: 2676]
	* unix/aclocal.m4: added -bnoentry to the AIX-* flags
	* generic/tkCursor.c: fixed equality error in GetCursorFromObj
	[Bug: 2562]
---
 generic/tkCanvas.c | 17 ++++++++---------
 generic/tkCursor.c |  5 +++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index a184769..8183c2b 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvas.c,v 1.7 1999/08/10 05:05:20 jingham Exp $
+ * RCS: @(#) $Id: tkCanvas.c,v 1.8 1999/09/02 17:02:27 hobbs Exp $
  */
 
 #include "default.h"
@@ -1840,18 +1840,17 @@ DisplayCanvas(clientData)
 	}
 	if (canvasPtr->highlightWidth != 0) {
 	    GC fgGC, bgGC;
-    
-             
-	    bgGC = Tk_GCForColor(canvasPtr->highlightColorPtr,
+
+	    bgGC = Tk_GCForColor(canvasPtr->highlightBgColorPtr,
 		    Tk_WindowId(tkwin));
 	    if (canvasPtr->textInfo.gotFocus) {
-		fgGC = Tk_GCForColor(canvasPtr->highlightBgColorPtr,
+		fgGC = Tk_GCForColor(canvasPtr->highlightColorPtr,
 			Tk_WindowId(tkwin));
-	    	TkpDrawHighlightBorder(tkwin, fgGC, bgGC, canvasPtr->highlightWidth,
-		        Tk_WindowId(tkwin));
+	    	TkpDrawHighlightBorder(tkwin, fgGC, bgGC,
+			canvasPtr->highlightWidth, Tk_WindowId(tkwin));
 	    } else {
-	    	TkpDrawHighlightBorder(tkwin, bgGC, bgGC, canvasPtr->highlightWidth,
-		        Tk_WindowId(tkwin));
+	    	TkpDrawHighlightBorder(tkwin, bgGC, bgGC,
+			canvasPtr->highlightWidth, Tk_WindowId(tkwin));
 	    }
 	}
     }
diff --git a/generic/tkCursor.c b/generic/tkCursor.c
index 87b284d..c8e5588 100644
--- a/generic/tkCursor.c
+++ b/generic/tkCursor.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCursor.c,v 1.3 1999/04/16 01:51:13 stanton Exp $
+ * RCS: @(#) $Id: tkCursor.c,v 1.4 1999/09/02 17:02:28 hobbs Exp $
  */
 
 #include "tkPort.h"
@@ -658,6 +658,7 @@ Tk_GetCursorFromObj(tkwin, objPtr)
     Tcl_Obj *objPtr;		/* The object from which to get pixels. */
 {
     TkCursor *cursorPtr = GetCursorFromObj(tkwin, objPtr);
+    /* GetCursorFromObj should never return NULL */
     return cursorPtr->cursor;
 }
 
@@ -716,7 +717,7 @@ GetCursorFromObj(tkwin, objPtr)
 
     for (cursorPtr = (TkCursor *) Tcl_GetHashValue(hashPtr);
 	    cursorPtr != NULL; cursorPtr = cursorPtr->nextPtr) {
-	if (Tk_Display(tkwin) != cursorPtr->display) {
+	if (Tk_Display(tkwin) == cursorPtr->display) {
 	    objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) cursorPtr;
 	    cursorPtr->objRefCount++;
 	    return cursorPtr;
-- 
cgit v0.12