summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXButton.c
diff options
context:
space:
mode:
authorvincentdarley <vincentdarley>2004-11-09 12:46:09 (GMT)
committervincentdarley <vincentdarley>2004-11-09 12:46:09 (GMT)
commitb7be4e0e9de6b6cb325269f53ce18596d73b4426 (patch)
treec929e40207f8d3ff0223c110e2d55935f7eb4bdd /macosx/tkMacOSXButton.c
parent13e3b568dfa3585aed1b9ec8e1e1737dc310e087 (diff)
downloadtk-b7be4e0e9de6b6cb325269f53ce18596d73b4426.zip
tk-b7be4e0e9de6b6cb325269f53ce18596d73b4426.tar.gz
tk-b7be4e0e9de6b6cb325269f53ce18596d73b4426.tar.bz2
fix to MacOSX compound button layout
Diffstat (limited to 'macosx/tkMacOSXButton.c')
-rw-r--r--macosx/tkMacOSXButton.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 320ffe6..0bdb767 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXButton.c,v 1.9 2004/02/18 00:40:24 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXButton.c,v 1.10 2004/11/09 12:46:10 vincentdarley Exp $
*/
#include "tkButton.h"
@@ -976,9 +976,15 @@ TkMacOSXDrawControl(
Tk_Font font;
int len;
- len = TkFontGetFirstTextLayout(butPtr->textLayout,
- &font, controlTitle);
- controlTitle[len] = 0;
+ if ((mbPtr->info.image == NULL) && (mbPtr->info.bitmap == None)
+ || (mbPtr->info.compound != COMPOUND_NONE)) {
+ len = TkFontGetFirstTextLayout(butPtr->textLayout,
+ &font, controlTitle);
+ controlTitle[len] = 0;
+ } else {
+ len = 0;
+ controlTitle[0] = 0;
+ }
if (bcmp(mbPtr->controlTitle, controlTitle, len+1)) {
CFStringRef cf;
cf = CFStringCreateWithCString(NULL,