diff options
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 68b442388a5..e8be9c6ad4c 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -89,6 +89,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 89 | #include <X11/Xaw/Paned.h> | 89 | #include <X11/Xaw/Paned.h> |
| 90 | #endif /* HAVE_XAW3D */ | 90 | #endif /* HAVE_XAW3D */ |
| 91 | #endif /* USE_LUCID */ | 91 | #endif /* USE_LUCID */ |
| 92 | #ifdef USE_MOTIF | ||
| 93 | #include "../lwlib/lwlib.h" | ||
| 94 | #endif | ||
| 92 | #else /* not USE_X_TOOLKIT */ | 95 | #else /* not USE_X_TOOLKIT */ |
| 93 | #ifndef USE_GTK | 96 | #ifndef USE_GTK |
| 94 | #include "../oldXMenu/XMenu.h" | 97 | #include "../oldXMenu/XMenu.h" |
| @@ -2532,13 +2535,16 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, | |||
| 2532 | 2535 | ||
| 2533 | #endif /* HAVE_MENUS */ | 2536 | #endif /* HAVE_MENUS */ |
| 2534 | 2537 | ||
| 2535 | /* Detect if a dialog or menu has been posted. */ | 2538 | #ifndef MSDOS |
| 2539 | /* Detect if a dialog or menu has been posted. MSDOS has its own | ||
| 2540 | implementation on msdos.c. */ | ||
| 2536 | 2541 | ||
| 2537 | int | 2542 | int |
| 2538 | popup_activated (void) | 2543 | popup_activated (void) |
| 2539 | { | 2544 | { |
| 2540 | return popup_activated_flag; | 2545 | return popup_activated_flag; |
| 2541 | } | 2546 | } |
| 2547 | #endif /* not MSDOS */ | ||
| 2542 | 2548 | ||
| 2543 | /* The following is used by delayed window autoselection. */ | 2549 | /* The following is used by delayed window autoselection. */ |
| 2544 | 2550 | ||
| @@ -2577,5 +2583,3 @@ syms_of_xmenu (void) | |||
| 2577 | #endif | 2583 | #endif |
| 2578 | } | 2584 | } |
| 2579 | 2585 | ||
| 2580 | /* arch-tag: 92ea573c-398e-496e-ac73-2436f7d63242 | ||
| 2581 | (do not change this comment) */ | ||