diff options
| author | patthoyts <patthoyts@noemail.net> | 2010-01-03 20:03:54 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@noemail.net> | 2010-01-03 20:03:54 (GMT) |
| commit | ff99615018fcc7a366c1f4255e32d7cfd720ed22 (patch) | |
| tree | 9697cfd7717518364e4ec9383241289742feb1fa /generic/tkMenu.h | |
| parent | d69be288b31cbc75ef6161bb7138706e4d6cbbf6 (diff) | |
| download | tk-ff99615018fcc7a366c1f4255e32d7cfd720ed22.zip tk-ff99615018fcc7a366c1f4255e32d7cfd720ed22.tar.gz tk-ff99615018fcc7a366c1f4255e32d7cfd720ed22.tar.bz2 | |
Patch 2848897: Support the system keyboard cues setting on Windows
Backported this patch from HEAD (kovalenko, thoyts)
FossilOrigin-Name: 67c26537e19a0db046102b0bd0910af039c496d2
Diffstat (limited to 'generic/tkMenu.h')
| -rw-r--r-- | generic/tkMenu.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/generic/tkMenu.h b/generic/tkMenu.h index 642958a..c304ee0 100644 --- a/generic/tkMenu.h +++ b/generic/tkMenu.h @@ -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: tkMenu.h,v 1.14 2007/12/13 15:24:16 dgp Exp $ + * RCS: @(#) $Id: tkMenu.h,v 1.14.2.1 2010/01/03 20:03:55 patthoyts Exp $ */ #ifndef _TKMENU @@ -50,6 +50,19 @@ enum compound { }; /* + * Additional menu entry drawing parameters for Windows platform. + * DRAW_MENU_ENTRY_ARROW makes TkpDrawMenuEntry draw the arrow + * itself when cascade entry is disabled. + * DRAW_MENU_ENTRY_NOUNDERLINE forbids underline when ODS_NOACCEL + * is set, thus obeying the system-wide Windows UI setting. + */ + +enum drawingParameters { + DRAW_MENU_ENTRY_ARROW = (1<<0), + DRAW_MENU_ENTRY_NOUNDERLINE = (1<<1) +}; + +/* * One of the following data structures is kept for each entry of each menu * managed by this file: */ @@ -548,7 +561,7 @@ MODULE_SCOPE void TkpDrawMenuEntry(TkMenuEntry *mePtr, Drawable d, Tk_Font tkfont, const Tk_FontMetrics *menuMetricsPtr, int x, int y, int width, int height, int strictMotif, - int drawArrow); + int drawingParameters); MODULE_SCOPE void TkpMenuInit(void); MODULE_SCOPE int TkpMenuNewEntry(TkMenuEntry *mePtr); MODULE_SCOPE int TkpNewMenu(TkMenu *menuPtr); |