summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-10-10 00:03:56 (GMT)
committerhobbs <hobbs>2003-10-10 00:03:56 (GMT)
commitf20e77cbd2724af11ed36f9e85980b608a5629ae (patch)
tree7e272a1fe9e63e88b9bfb4208a8d570f2ae792d4
parent946b98c68ec1de3f3b0d3d70a9c5fbefcc63144c (diff)
downloadtk-f20e77cbd2724af11ed36f9e85980b608a5629ae.zip
tk-f20e77cbd2724af11ed36f9e85980b608a5629ae.tar.gz
tk-f20e77cbd2724af11ed36f9e85980b608a5629ae.tar.bz2
correct imageYOffset for buttons with just images
-rw-r--r--ChangeLog5
-rw-r--r--win/tkWinButton.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ee1127..a27dc78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-09 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/tkWinButton.c (TkpDisplayButton): correct imageYOffset for
+ buttons with just images.
+
2003-10-06 Don Porter <dgp@users.sourceforge.net>
* doc/ConfigWidg.3: Removed reference to Tk_Offset from the
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index 415a202..2ad0c4b 100644
--- a/win/tkWinButton.c
+++ b/win/tkWinButton.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: tkWinButton.c,v 1.20.2.2 2003/04/26 02:53:47 hobbs Exp $
+ * RCS: @(#) $Id: tkWinButton.c,v 1.20.2.3 2003/10/10 00:03:57 hobbs Exp $
*/
#define OEMRESOURCE
@@ -560,15 +560,15 @@ TkpDisplayButton(clientData)
y += offset;
}
imageXOffset += x;
- imageXOffset += y;
+ imageYOffset += y;
if (butPtr->image != NULL) {
if ((butPtr->selectImage != NULL) &&
(butPtr->flags & SELECTED)) {
Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height,
- pixmap, x, y);
+ pixmap, imageXOffset, imageYOffset);
} else {
Tk_RedrawImage(butPtr->image, 0, 0, width, height, pixmap,
- x, y);
+ imageXOffset, imageYOffset);
}
} else {
XSetClipOrigin(butPtr->display, gc, x, y);