Mercurial > hg > xemacs-beta
comparison lwlib/xlwmenu.c @ 239:41f2f0e326e9 r20-5b18
Import from CVS: tag r20-5b18
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:15:48 +0200 |
parents | 262b8bb4a523 |
children | f220cc83d72e |
comparison
equal
deleted
inserted
replaced
238:b5f2e56b938d | 239:41f2f0e326e9 |
---|---|
1637 if (highlighted) | 1637 if (highlighted) |
1638 { | 1638 { |
1639 if (val->enabled) | 1639 if (val->enabled) |
1640 gc = mw->menu.highlight_gc; | 1640 gc = mw->menu.highlight_gc; |
1641 else | 1641 else |
1642 gc = mw->menu.inactive_button_gc; | 1642 gc = mw->menu.inactive_gc; |
1643 } | 1643 } |
1644 else if (menu_pb) | 1644 else if (menu_pb) |
1645 { | 1645 { |
1646 if (val->enabled) | 1646 if (val->enabled) |
1647 gc = mw->menu.button_gc; | 1647 gc = mw->menu.button_gc; |
2503 && old_stack [last_same]->contents) | 2503 && old_stack [last_same]->contents) |
2504 last_same--; | 2504 last_same--; |
2505 | 2505 |
2506 /* Memorize the previously selected item to be able to refresh it */ | 2506 /* Memorize the previously selected item to be able to refresh it */ |
2507 old_selection = last_same + 1 < old_depth ? old_stack [last_same + 1] : NULL; | 2507 old_selection = last_same + 1 < old_depth ? old_stack [last_same + 1] : NULL; |
2508 if (old_selection && !old_selection->enabled) | |
2509 old_selection = NULL; | |
2510 new_selection = last_same + 1 < new_depth ? new_stack [last_same + 1] : NULL; | 2508 new_selection = last_same + 1 < new_depth ? new_stack [last_same + 1] : NULL; |
2511 if (new_selection && !new_selection->enabled) | |
2512 new_selection = NULL; | |
2513 | 2509 |
2514 /* updates old_state from new_state. It has to be done now because | 2510 /* updates old_state from new_state. It has to be done now because |
2515 display_menu (called below) uses the old_stack to know what to display. */ | 2511 display_menu (called below) uses the old_stack to know what to display. */ |
2516 for (i = last_same + 1; i < new_depth; i++) | 2512 for (i = last_same + 1; i < new_depth; i++) |
2517 old_stack [i] = new_stack [i]; | 2513 old_stack [i] = new_stack [i]; |