From 3cc54f81ce424374cbd80782edcfc3b1c451231a Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Fri, 10 Oct 2003 00:02:59 +0000
Subject: correct imageYOffset for buttons with just images

---
 ChangeLog         | 5 +++++
 win/tkWinButton.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efc9e8d..df72a03 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  Joe English  <jenglish@users.sourceforge.net>
 	* library/text.tcl, doc/text.n:  Text widget binding for 
 	Control-v is now Mac-only, since it conflicts with standard 
diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index 2a9ddda..c085af7 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.22 2003/04/26 02:59:20 hobbs Exp $
+ * RCS: @(#) $Id: tkWinButton.c,v 1.23 2003/10/10 00:03:01 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);
-- 
cgit v0.12