diff options
| author | stanton <stanton> | 1998-11-25 22:36:50 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1998-11-25 22:36:50 (GMT) |
| commit | c014c63c8c43331ce35df4b0f9a4415a16e63080 (patch) | |
| tree | 9f2a29d24cd0d4eef74d3f6d9f457fba5204dcc8 | |
| parent | 7540467c0e1e8b087c174eccf2a8ea3794fdfebe (diff) | |
| download | tk-c014c63c8c43331ce35df4b0f9a4415a16e63080.zip tk-c014c63c8c43331ce35df4b0f9a4415a16e63080.tar.gz tk-c014c63c8c43331ce35df4b0f9a4415a16e63080.tar.bz2 | |
* generic/tkMenu.c (MenuWidgetObjCmd): disabled menu entries were
getting reenabled whenever the mouse passed over the entry [Bug: 860]
| -rw-r--r-- | generic/tkMenu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index bef635f..7de20b1 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -12,7 +12,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.c,v 1.1.4.3 1998/11/24 21:42:39 stanton Exp $ + * RCS: @(#) $Id: tkMenu.c,v 1.1.4.4 1998/11/25 22:36:50 stanton Exp $ */ /* @@ -692,8 +692,9 @@ MenuWidgetObjCmd(clientData, interp, objc, objv) goto done; } if ((index >= 0) - && (menuPtr->entries[index]->type == SEPARATOR_ENTRY) - && (menuPtr->entries[index]->state == ENTRY_DISABLED)) { + && ((menuPtr->entries[index]->type == SEPARATOR_ENTRY) + || (menuPtr->entries[index]->state + == ENTRY_DISABLED))) { index = -1; } result = TkActivateMenuEntry(menuPtr, index); |