diff options
| author | das <das@noemail.net> | 2009-06-29 14:35:01 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2009-06-29 14:35:01 (GMT) |
| commit | a6401db9ac290e17faaf7897ec75bf07ef5b743f (patch) | |
| tree | 81b5743d2ff5d45f2ee4992153e4f34949ea8f8a /generic/tkButton.c | |
| parent | 26cb1dfcf18ed78319ed485346885111ef5c34ed (diff) | |
| download | tk-macosx-cocoa-merge.zip tk-macosx-cocoa-merge.tar.gz tk-macosx-cocoa-merge.tar.bz2 | |
Merge of TkAqua Cocoa portmacosx-cocoa-merge
FossilOrigin-Name: 05bd0a2cb86bb730d85069b3282e569b6c23d911
Diffstat (limited to 'generic/tkButton.c')
| -rw-r--r-- | generic/tkButton.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/generic/tkButton.c b/generic/tkButton.c index fea680f..a0968bc 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkButton.c,v 1.34 2009/05/14 11:54:00 patthoyts Exp $ + * RCS: @(#) $Id: tkButton.c,v 1.35 2009/06/29 14:35:01 das Exp $ */ #include "tkInt.h" @@ -1800,9 +1800,15 @@ ButtonSelectImageProc( { register TkButton *butPtr = clientData; +#ifdef MAC_OSX_TK + if (butPtr->tkwin != NULL) { + TkpComputeButtonGeometry(butPtr); + } +#else /* * Don't recompute geometry: it's controlled by the primary image. */ +#endif if ((butPtr->flags & SELECTED) && (butPtr->tkwin != NULL) && Tk_IsMapped(butPtr->tkwin) @@ -1841,9 +1847,15 @@ ButtonTristateImageProc( { register TkButton *butPtr = clientData; +#ifdef MAC_OSX_TK + if (butPtr->tkwin != NULL) { + TkpComputeButtonGeometry(butPtr); + } +#else /* * Don't recompute geometry: it's controlled by the primary image. */ +#endif if ((butPtr->flags & TRISTATED) && (butPtr->tkwin != NULL) && Tk_IsMapped(butPtr->tkwin) |