summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2003-08-20 23:31:38 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2003-08-20 23:31:38 (GMT)
commit1558f43ed3ca561ade785b869e42c0108f52d6a5 (patch)
tree17c436c5cd7a25f4f297787a4807436a5ea238e9
parent1f36e4d449819ec2c6381221f9abbc41dcc2230c (diff)
downloadtk-1558f43ed3ca561ade785b869e42c0108f52d6a5.zip
tk-1558f43ed3ca561ade785b869e42c0108f52d6a5.tar.gz
tk-1558f43ed3ca561ade785b869e42c0108f52d6a5.tar.bz2
* win/tkWin3d.c: Applied Tk patch 791273 from Jeremy Collins which
improves the 3d lines for sunken widgets under windows.
-rw-r--r--ChangeLog5
-rw-r--r--win/tkWin3d.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c30ed02..7e5230d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-21 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/tkWin3d.c: Applied Tk patch 791273 from Jeremy Collins which
+ improves the 3d lines for sunken widgets under windows.
+
2003-08-20 Jeff Hobbs <jeffh@ActiveState.com>
* library/demos/widget: Redo code view dialog, use named fonts,
diff --git a/win/tkWin3d.c b/win/tkWin3d.c
index 8161eba..1b14dd2 100644
--- a/win/tkWin3d.c
+++ b/win/tkWin3d.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWin3d.c,v 1.5 2000/04/14 01:36:35 ericm Exp $
+ * RCS: @(#) $Id: tkWin3d.c,v 1.6 2003/08/20 23:31:39 patthoyts Exp $
*/
#include "tkWinInt.h"
@@ -146,10 +146,10 @@ Tk_3DVerticalBevel(tkwin, drawable, border, x, y, width, height,
break;
case TK_RELIEF_SUNKEN:
left = (leftBevel)
- ? ((WinBorder *)borderPtr)->dark2ColorPtr->pixel
+ ? borderPtr->darkGC->foreground
: ((WinBorder *)borderPtr)->light2ColorPtr->pixel;
right = (leftBevel)
- ? borderPtr->darkGC->foreground
+ ? ((WinBorder *)borderPtr)->dark2ColorPtr->pixel
: borderPtr->lightGC->foreground;
break;
case TK_RELIEF_RIDGE:
@@ -247,10 +247,10 @@ Tk_3DHorizontalBevel(tkwin, drawable, border, x, y, width, height,
break;
case TK_RELIEF_SUNKEN:
topColor = (topBevel)
- ? ((WinBorder *)borderPtr)->dark2ColorPtr->pixel
+ ? borderPtr->darkGC->foreground
: ((WinBorder *)borderPtr)->light2ColorPtr->pixel;
bottomColor = (topBevel)
- ? borderPtr->darkGC->foreground
+ ? ((WinBorder *)borderPtr)->dark2ColorPtr->pixel
: borderPtr->lightGC->foreground;
break;
case TK_RELIEF_RIDGE: