summaryrefslogtreecommitdiffstats
path: root/generic/tkMenu.h
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2010-01-03 20:03:55 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2010-01-03 20:03:55 (GMT)
commite732ca1eeb37060c866b1e0f32bb45eb0c27db5d (patch)
tree9697cfd7717518364e4ec9383241289742feb1fa /generic/tkMenu.h
parent794905497922ded3485e12e88b23990af8d1d1fa (diff)
downloadtk-e732ca1eeb37060c866b1e0f32bb45eb0c27db5d.zip
tk-e732ca1eeb37060c866b1e0f32bb45eb0c27db5d.tar.gz
tk-e732ca1eeb37060c866b1e0f32bb45eb0c27db5d.tar.bz2
Patch 2848897: Support the system keyboard cues setting on Windows
Backported this patch from HEAD (kovalenko, thoyts)
Diffstat (limited to 'generic/tkMenu.h')
-rw-r--r--generic/tkMenu.h17
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);