summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-09-03 01:05:11 (GMT)
committerhobbs <hobbs>2002-09-03 01:05:11 (GMT)
commiteb14a1a2b578e0530e1877a74ceb39fb77741f1f (patch)
tree7b2dd96c03b7db69b815f9125b3ecf347b434563
parentdbf76dc7b3c5d6d9d1d851a7827ac2abd49f46a1 (diff)
downloadtk-eb14a1a2b578e0530e1877a74ceb39fb77741f1f.zip
tk-eb14a1a2b578e0530e1877a74ceb39fb77741f1f.tar.gz
tk-eb14a1a2b578e0530e1877a74ceb39fb77741f1f.tar.bz2
correction to r1.19 fix to only incr inset when no image is used
-rw-r--r--win/tkWinButton.c12
1 files 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;
}