summaryrefslogtreecommitdiffstats
path: root/win/tkWinMenu.c
diff options
context:
space:
mode:
Diffstat (limited to 'win/tkWinMenu.c')
-rw-r--r--win/tkWinMenu.c28
1 files changed, 12 insertions, 16 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 69f8eb7..203389e 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.32 2004/05/03 22:40:30 hobbs Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.33 2004/05/03 23:23:14 hobbs Exp $
*/
#define OEMRESOURCE
@@ -2116,26 +2116,22 @@ DrawMenuEntryLabel(
}
case COMPOUND_LEFT: {
/*
- * The standard image position on Windows is
- * in the indicator space to the left of
- * the entries. Of course if this entry is
- * a radio/check button, we can't do that
- * because the indicator space will be used.
+ * The standard image position on Windows is in the indicator
+ * space to the left of the entries, unless this entry is a
+ * radio|check button because then the indicator space will
+ * be used.
*/
- if ((mePtr->type == CHECK_BUTTON_ENTRY)
- || (mePtr->type == RADIO_BUTTON_ENTRY)) {
- textXOffset = imageWidth + 2;
- textYOffset = 0;
- imageXOffset = 0;
- imageYOffset = 0;
- } else {
- textXOffset = imageWidth + 2 - indicatorSpace;
+ textXOffset = imageWidth + 2;
+ textYOffset = 0;
+ imageXOffset = 0;
+ imageYOffset = 0;
+ if ((mePtr->type != CHECK_BUTTON_ENTRY)
+ && (mePtr->type != RADIO_BUTTON_ENTRY)) {
+ textXOffset -= indicatorSpace;
if (textXOffset < 0) {
textXOffset = 0;
}
- textYOffset = 0;
imageXOffset = -indicatorSpace;
- imageYOffset = 0;
}
break;
}