diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2014-10-30 18:23:52 +0100 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2014-10-30 18:23:52 +0100 |
| commit | b7bf631c809e7dc31ba423ac93bdf30d092f6129 (patch) | |
| tree | 40bb74e18b5ac07035222e10abd189b50dba76d8 /src/nsfns.m | |
| parent | fda2bc46a80aa8c9e2742f6ca149969664c79dc7 (diff) | |
| download | emacs-b7bf631c809e7dc31ba423ac93bdf30d092f6129.tar.gz | |
* nsfns.m (x_icon): icon_top/left is int.
* nsterm.h (EmacsScroller): Replace Lisp_Object win with
struct window*.
Remove getMouseMotionPart.
(ns_output): Make icon_top/left int.
* nsterm.m (ns_mouse_position): Remove unused code.
(initFrame:window:, dealloc): Use window instead of win.
(getMouseMotionPart:window:x:y:): Remove, unused.
(sendScrollEventAtLoc:fromEvent:): Make Lisp_Object win from window.
Fixes: debbugs:18889
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 58746aed9fa..9d9f5416c86 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -913,8 +913,8 @@ x_icon (struct frame *f, Lisp_Object parms) Lisp_Object icon_x, icon_y; struct ns_display_info *dpyinfo = check_ns_display_info (Qnil); - f->output_data.ns->icon_top = Qnil; - f->output_data.ns->icon_left = Qnil; + f->output_data.ns->icon_top = -1; + f->output_data.ns->icon_left = -1; /* Set the position of the icon. */ icon_x = x_get_arg (dpyinfo, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER); @@ -923,8 +923,8 @@ x_icon (struct frame *f, Lisp_Object parms) { CHECK_NUMBER (icon_x); CHECK_NUMBER (icon_y); - f->output_data.ns->icon_top = icon_y; - f->output_data.ns->icon_left = icon_x; + f->output_data.ns->icon_top = XINT (icon_y); + f->output_data.ns->icon_left = XINT (icon_x); } else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound)) error ("Both left and top icon corners of icon must be specified"); |