diff options
| author | Eli Zaretskii | 2013-10-16 18:07:36 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-10-16 18:07:36 +0300 |
| commit | b911a94d7993508f8a53360a4be4651de30ea301 (patch) | |
| tree | 67cc249ca08435bc93811159959fe82aa407a47f | |
| parent | 89f20e05797d4d69a0731559c87c656fd54ac338 (diff) | |
| download | emacs-b911a94d7993508f8a53360a4be4651de30ea301.tar.gz emacs-b911a94d7993508f8a53360a4be4651de30ea301.zip | |
Fix bug #15629 with GUI menus on NS.
src/menu.c (have_boxes): Fix redundant simulation of radio buttons
in NS GUI sessions.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/menu.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6b4660b2baf..4874187b3c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-10-16 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * menu.c (have_boxes): Fix redundant simulation of radio buttons | ||
| 4 | in NS GUI sessions. (Bug#15629) | ||
| 5 | |||
| 1 | 2013-10-16 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2013-10-16 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | * fns.c (Fstring_as_unibyte): Use xlispstrdup. | 8 | * fns.c (Fstring_as_unibyte): Use xlispstrdup. |
diff --git a/src/menu.c b/src/menu.c index d87d495f96b..96b8f73824a 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -55,7 +55,7 @@ extern HMENU current_popup_menu; | |||
| 55 | static bool | 55 | static bool |
| 56 | have_boxes (void) | 56 | have_boxes (void) |
| 57 | { | 57 | { |
| 58 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) | 58 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI) || defined(HAVE_NS) |
| 59 | if (FRAME_WINDOW_P (XFRAME (Vmenu_updating_frame))) | 59 | if (FRAME_WINDOW_P (XFRAME (Vmenu_updating_frame))) |
| 60 | return 1; | 60 | return 1; |
| 61 | #endif | 61 | #endif |