diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-02-04 18:13:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-02-04 18:13:51 +0200 |
| commit | e139a33cd97a0e12405cae760ca5e436d9dcbc74 (patch) | |
| tree | e744130600582bf8005e7aad818c55a662a18428 /src/menu.h | |
| parent | 40d2f2e4bb6b4e0b373180ae12836f6b335dc0bb (diff) | |
| download | emacs-e139a33cd97a0e12405cae760ca5e436d9dcbc74.tar.gz | |
Fix bug #16636 with simple dialogs on MS-Windows.
src/w32menu.c (w32_popup_dialog): Don't condition the whole function
on HAVE_DIALOGS. If the dialog is "simple", pop up a message box
to show it; otherwise return 'unsupported--w32-dialog' to signal
to the caller that emulation with menus is necessary. This
resurrects code inadvertently deleted by the 2013-10-08 commit.
(syms_of_w32menu): DEFSYM Qunsupported__w32_dialog.
src/w32term.h (w32_popup_dialog): Prototype is no longer conditioned
by HAVE_DIALOGS.
src/menu.c (Fx_popup_dialog): Don't condition the call to
w32_popup_dialog on HAVE_DIALOGS. If w32_popup_dialog returns a
special symbol 'unsupported--w32-dialog', emulate the dialog with
a menu by calling x-popup-menu.
src/menu.h (Qunsupported__w32_dialog): New extern variable.
Diffstat (limited to 'src/menu.h')
| -rw-r--r-- | src/menu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/menu.h b/src/menu.h index ae97fe2e458..429dcfa6221 100644 --- a/src/menu.h +++ b/src/menu.h @@ -21,6 +21,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "systime.h" /* for Time */ +#ifdef HAVE_NTGUI +extern Lisp_Object Qunsupported__w32_dialog; +#endif + extern void x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval); |