diff options
| author | mdejong <mdejong@noemail.net> | 2004-09-23 00:56:13 (GMT) |
|---|---|---|
| committer | mdejong <mdejong@noemail.net> | 2004-09-23 00:56:13 (GMT) |
| commit | 059d6a92c9a0c1b5a125b5ac253757adc34fa29a (patch) | |
| tree | a5ef654dd2cffd06d968ff35befb088f3e4a8054 /win/tkWinInt.h | |
| parent | 017ead363730c3b696720e8d54c8b324b5ca5264 (diff) | |
| download | tk-059d6a92c9a0c1b5a125b5ac253757adc34fa29a.zip tk-059d6a92c9a0c1b5a125b5ac253757adc34fa29a.tar.gz tk-059d6a92c9a0c1b5a125b5ac253757adc34fa29a.tar.bz2 | |
* generic/tkInt.decls: Add decl for TkWinGetPlatformTheme.
It is only defined under Win32.
* generic/tkIntPlatDecls.h: Regen.
* generic/tkStubInit.c: Regen.
* win/tkWinInt.h: Define TK_THEME_WIN_CLASSIC and
TK_THEME_WIN_XP.
* win/tkWinMenu.c (DrawMenuEntryAccelerator, DrawMenuEntryLabel):
Draw a disabled 3D text highlight for the accelerator only
with the Win95/98 look. Same goes for the menu entry text.
* win/tkWinX.c (TkWinGetPlatformId, TkWinGetPlatformTheme):
Automatically detect the Windows theme in use and return
either TK_THEME_WIN_CLASSIC or TK_THEME_WIN_XP when the
TkWinGetPlatformTheme function is invoked.
[Patch 866194]
* win/tkWinMenu.c: only provide a submenu handle when the
MF_POPUP flag is given, fixing a recently-introduced crash
when submenus are disabled. Also better error checking for
this sort of situation in the future.
* win/tkWinMenu.c (ReconfigureWindowsMenu): Fix drawing of a disabled
(TkWinHandleMenuEvent, DrawMenuEntryArrow): cascade menu arrow. Tk was
displaying a disabled cascade menu arrow in black instead of
gray. This was caused by a bug in the Win32 code for user drawn
menu items. The fix is to avoid telling Windows that the menu item
is a cascade type and then draw the gray arrow bitmap on our own.
[Patch 865842]
* win/tkWinMenu.c (DrawWindowsSystemBitmap): Fix a strange Win32
bug where the logical coordinates returned by a call to DPtoLP are
wrong the first time a menu is posted. This bug manifested itself
by drawing the bitmap in the wrong place in a menu. The fix was
to pass the newly created DC instead of the DC from the window.
* win/tkWinMenu.c (DrawMenuEntryAccelerator):
(DrawMenuEntryLabel): When drawing the label text and accelerator
text for a disabled menu entry be sure to draw a 3D highlight.
The only exception to this is when a disabled menu entry is
highlighted, in that case do not draw a 3D hightlight.
* win/tkWinMenu.c (DrawMenuEntryAccelerator, DrawMenuEntryArrow):
Move the unused menu arrow drawing code in
DrawMenuEntryAccelerator into a new function named
DrawMenuEntryArrow. This makes no functional change but it will
make it easier to fix things in the future.
FossilOrigin-Name: e42dad6e91ffbd59e77f8378f5dd48f2fade4b1e
Diffstat (limited to 'win/tkWinInt.h')
| -rw-r--r-- | win/tkWinInt.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/win/tkWinInt.h b/win/tkWinInt.h index 0266099..7a1d1d7 100644 --- a/win/tkWinInt.h +++ b/win/tkWinInt.h @@ -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: tkWinInt.h,v 1.14.2.3 2004/09/17 23:36:16 hobbs Exp $ + * RCS: @(#) $Id: tkWinInt.h,v 1.14.2.4 2004/09/23 00:56:15 mdejong Exp $ */ #ifndef _TKWININT @@ -210,5 +210,11 @@ EXTERN TkWinProcs *tkWinProcs; extern Tcl_Encoding TkWinGetKeyInputEncoding _ANSI_ARGS_((void)); extern Tcl_Encoding TkWinGetUnicodeEncoding _ANSI_ARGS_((void)); +/* + * Values returned by TkWinGetPlatformTheme. + */ +#define TK_THEME_WIN_CLASSIC 1 +#define TK_THEME_WIN_XP 2 + #endif /* _TKWININT */ |