* nsmenu.m (ns_popup_dialog): Add an "ok" button if no buttons

are specified.

Fixes: debbugs:9168

diff --git a/src/ChangeLog b/src/ChangeLog
index 3fc8067e114ea2c3bca4eadd53c4b3c1e64e191e..dd25d155c66937f4b22834037da3843a761ef1b4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsmenu.m (ns_popup_dialog): Add an "ok" button if no buttons
+       are specified (Bug#9168).
+
 2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * bidi.c (bidi_dump_cached_states): Fix printf format mismatch.

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 6a9ee7dd4f5826fce382e3948e37b463fc280dd6..6931b7a3c012140c6d6b78ba31a9d6cfbbbe4358 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1340,7 +1340,7 @@ Lisp_Object
 ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
 {
   id dialog;
-  Lisp_Object window, tem;
+  Lisp_Object window, tem, title;
   struct frame *f;
   NSPoint p;
   BOOL isQ;
@@ -1389,6 +1389,14 @@ ns_popup_dialog (Lisp_Object position, Lisp_Object contents, Lisp_Object header)
   p.x = (int)f->left_pos + ((int)FRAME_COLUMN_WIDTH (f) * f->text_cols)/2;
   p.y = (int)f->top_pos + (FRAME_LINE_HEIGHT (f) * f->text_lines)/2;
 
+  title = Fcar (contents);
+  CHECK_STRING (title);
+
+  if (NILP (Fcar (Fcdr (contents))))
+    /* No buttons specified, add an "Ok" button so users can pop down
+       the dialog.  */
+    contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil));
+
   BLOCK_INPUT;
   dialog = [[EmacsDialogPanel alloc] initFromContents: contents
                                            isQuestion: isQ];