diff options
| author | nijtmans <nijtmans> | 2010-11-03 12:11:44 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-11-03 12:11:44 (GMT) |
| commit | 1bf8f221df1b86e8c623d37a0f7f20e52da060ad (patch) | |
| tree | 2b0fbd8966932f7c2c4c80b17100ce6d2dd66b06 /win/tkWinMenu.c | |
| parent | eac7d6560603161bdf15eff58f8e556341cd9a50 (diff) | |
| download | tk-1bf8f221df1b86e8c623d37a0f7f20e52da060ad.zip tk-1bf8f221df1b86e8c623d37a0f7f20e52da060ad.tar.gz tk-1bf8f221df1b86e8c623d37a0f7f20e52da060ad.tar.bz2 | |
[FRQ 2965056]: Windows build with -DUNICODE
Diffstat (limited to 'win/tkWinMenu.c')
| -rw-r--r-- | win/tkWinMenu.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index dd6e2b3..3aaebd8 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.77 2010/10/11 13:33:30 nijtmans Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.78 2010/11/03 12:11:44 nijtmans Exp $ */ #define OEMRESOURCE @@ -3256,17 +3256,11 @@ SetDefaults( * only way to ensure menu items line up, and is not documented. */ - if (TkWinGetPlatformId() >= VER_PLATFORM_WIN32_WINDOWS) { - indicatorDimensions[0] = GetSystemMetrics(SM_CYMENUCHECK); - indicatorDimensions[1] = ((GetSystemMetrics(SM_CXFIXEDFRAME) + - GetSystemMetrics(SM_CXBORDER) - + GetSystemMetrics(SM_CXMENUCHECK) + 7) & 0xFFF8) - - GetSystemMetrics(SM_CXFIXEDFRAME); - } else { - DWORD dimensions = GetMenuCheckMarkDimensions(); - indicatorDimensions[0] = HIWORD(dimensions); - indicatorDimensions[1] = LOWORD(dimensions); - } + indicatorDimensions[0] = GetSystemMetrics(SM_CYMENUCHECK); + indicatorDimensions[1] = ((GetSystemMetrics(SM_CXFIXEDFRAME) + + GetSystemMetrics(SM_CXBORDER) + + GetSystemMetrics(SM_CXMENUCHECK) + 7) & 0xFFF8) + - GetSystemMetrics(SM_CXFIXEDFRAME); /* * Accelerators used to be always underlines until Win2K when a system |