diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-08-27 20:53:10 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-08-27 20:53:10 +0200 |
| commit | 0f19feff2536f40cd10c3b7201ecd89e40148626 (patch) | |
| tree | 81545ee3d78c04070cafef3243dfff112fdf4927 /src/nsterm.h | |
| parent | de1339b0a8a5b6b8bf784c816b2b974f4610e3ac (diff) | |
| download | emacs-0f19feff2536f40cd10c3b7201ecd89e40148626.tar.gz | |
* nsmenu.m (initWithContentRect:styleMask:backing:defer:): Initialize
dialog_return.
(windowShouldClose:): Use stop instead of stopModalWithCode.
(clicked:): Ditto, and also set dialog_return.
(timeout_handler:): Use stop instead of abortModal. Send a dummy
event.
(runDialogAt:): Make ret Lisp_Object. Set it from dialog_return when
modal loop returns.
* nsterm.h (NSPanel): New class variable dialog_return.
Fixes: debbugs:12258
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index 54f4a4ec89e..72b8d13cc47 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -196,6 +196,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ NSMatrix *matrix; int rows, cols; int timer_fired; + Lisp_Object dialog_return; } - initFromContents: (Lisp_Object)menu isQuestion: (BOOL)isQ; - addButton: (char *)str value: (Lisp_Object)val row: (int)row; |