summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2010-01-09 00:54:06 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2010-01-09 00:54:06 (GMT)
commit14f741723a3016c1d616acf22f253a0d6aecc03b (patch)
tree9d7ca731a7a70029796af147b571f3ebb944e22d /unix
parent2df4377e0ddaa40ad2acee32cb7e0eccdc486548 (diff)
downloadtk-14f741723a3016c1d616acf22f253a0d6aecc03b.zip
tk-14f741723a3016c1d616acf22f253a0d6aecc03b.tar.gz
tk-14f741723a3016c1d616acf22f253a0d6aecc03b.tar.bz2
TIP 360: Remove special handling of the .help menu on X11.
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixMenu.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
index 0fcadb6..4529200 100644
--- a/unix/tkUnixMenu.c
+++ b/unix/tkUnixMenu.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixMenu.c,v 1.19 2007/12/13 15:28:50 dgp Exp $
+ * RCS: @(#) $Id: tkUnixMenu.c,v 1.19.2.1 2010/01/09 00:54:06 patthoyts Exp $
*/
#include "default.h"
@@ -1264,6 +1264,18 @@ SetHelpMenu(
TkMenu *menuPtr) /* The menu we are checking */
{
TkMenuEntry *cascadeEntryPtr;
+ int useMotifHelp = 0;
+ const char *option = NULL;
+ if (menuPtr->tkwin) {
+ option = Tk_GetOption(menuPtr->tkwin, "useMotifHelp", "UseMotifHelp");
+ if (option != NULL) {
+ Tcl_GetBoolean(NULL, option, &useMotifHelp);
+ }
+ }
+
+ if (!useMotifHelp) {
+ return;
+ }
for (cascadeEntryPtr = menuPtr->menuRefPtr->parentEntryPtr;
cascadeEntryPtr != NULL;