diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2005-01-07 16:59:57 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2005-01-07 16:59:57 +0000 |
| commit | ff59904afeadf91b9b0c101d273a46e5571fba9f (patch) | |
| tree | 6a484bae92178df4e0749d617a3b03130d2c70eb /src/xselect.c | |
| parent | 1bc9c7ed8b140a10f1e263091882f41aa6615b1d (diff) | |
| download | emacs-ff59904afeadf91b9b0c101d273a46e5571fba9f.tar.gz | |
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
(xg_tool_bar_callback, xg_tool_bar_help_callback)
(update_frame_tool_bar): Cast to EMACS_INT to avoid compiler
warning.
* xselect.c (x_get_foreign_selection, x_fill_property_data)
(Fx_get_atom_name, Fx_send_client_event): Replace XFLOAT with
XFLOAT_DATA to get extract number from Lisp object.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xselect.c b/src/xselect.c index 38547ea6bbf..5dd63b9c735 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1383,7 +1383,7 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp) else if (INTEGERP (time_stamp)) requestor_time = (Time) XUINT (time_stamp); else if (FLOATP (time_stamp)) - requestor_time = (Time) XFLOAT (time_stamp); + requestor_time = (Time) XFLOAT_DATA (time_stamp); else error ("TIME_STAMP must be cons or number"); } @@ -2468,7 +2468,7 @@ x_check_property_data (data) DPY is the display use to look up X atoms. DATA is a Lisp list of values to be converted. RET is the C array that contains the converted values. It is assumed - it is big enough to hol all values. + it is big enough to hold all values. FORMAT is 8, 16 or 32 and gives the size in bits for each C value to be stored in RET. */ @@ -2492,7 +2492,7 @@ x_fill_property_data (dpy, data, ret, format) if (INTEGERP (o)) val = (CARD32) XFASTINT (o); else if (FLOATP (o)) - val = (CARD32) XFLOAT (o); + val = (CARD32) XFLOAT_DATA (o); else if (CONSP (o)) val = (CARD32) cons_to_long (o); else if (STRINGP (o)) @@ -2597,7 +2597,7 @@ If the value is 0 or the atom is not known, return the empty string. */) if (INTEGERP (value)) atom = (Atom) XUINT (value); else if (FLOATP (value)) - atom = (Atom) XFLOAT (value); + atom = (Atom) XFLOAT_DATA (value); else if (CONSP (value)) atom = (Atom) cons_to_long (value); else @@ -2729,7 +2729,7 @@ are ignored. */) else if (INTEGERP (dest)) wdest = (Window) XFASTINT (dest); else if (FLOATP (dest)) - wdest = (Window) XFLOAT (dest); + wdest = (Window) XFLOAT_DATA (dest); else if (CONSP (dest)) { if (! NUMBERP (XCAR (dest)) || ! NUMBERP (XCDR (dest))) |