diff options
| author | hobbs <hobbs@noemail.net> | 2004-05-03 23:23:41 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2004-05-03 23:23:41 (GMT) |
| commit | 72668c9d159235b6041f55d30f6aa30960637843 (patch) | |
| tree | 24b95de3649b4f79162ee5bcf244300f7d17e2e3 /win/tkWinMenu.c | |
| parent | 4277d70b425f01bf6a08107cc60aec0e730ca4d3 (diff) | |
| download | tk-72668c9d159235b6041f55d30f6aa30960637843.zip tk-72668c9d159235b6041f55d30f6aa30960637843.tar.gz tk-72668c9d159235b6041f55d30f6aa30960637843.tar.bz2 | |
* win/tkWinMenu.c, unix/tkUnixMenu.c (DrawMenuEntryLabel): place
images of compound menu entries in indicator space if not a radio
of checkbutton. [Bug #756952] (eserte)
FossilOrigin-Name: bbd12840e04caaee8c449a2ee2aa745260677cb3
Diffstat (limited to 'win/tkWinMenu.c')
| -rw-r--r-- | win/tkWinMenu.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 0d89cbe..aea7d73 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.21.2.1 2004/05/03 22:40:58 hobbs Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.21.2.2 2004/05/03 23:23:42 hobbs Exp $ */ #define OEMRESOURCE @@ -1976,10 +1976,24 @@ DrawMenuEntryLabel( break; } case COMPOUND_LEFT: { + /* + * 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. + */ 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; + } + imageXOffset = -indicatorSpace; + } break; } case COMPOUND_RIGHT: { |