From eb14a1a2b578e0530e1877a74ceb39fb77741f1f Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Tue, 3 Sep 2002 01:05:11 +0000
Subject: correction to r1.19 fix to only incr inset when no image is used

---
 win/tkWinButton.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/win/tkWinButton.c b/win/tkWinButton.c
index e004a3c..1f050aa 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.19 2002/09/02 23:32:35 hobbs Exp $
+ * RCS: @(#) $Id: tkWinButton.c,v 1.20 2002/09/03 01:05:11 hobbs Exp $
  */
 
 #define OEMRESOURCE
@@ -896,10 +896,12 @@ TkpComputeButtonGeometry(butPtr)
 	    width  -= 10;
 	    height -= 10;
 
-	    /*
-	     * Extra inset for the focus ring.
-	     */
-	    butPtr->inset += 1;
+	    if (!haveImage) {
+		/*
+		 * Extra inset for the focus ring.
+		 */
+		butPtr->inset += 1;
+	    }
 	    break;
 	}
 
-- 
cgit v0.12