diff src/xselect.c @ 59411:ecb6689e04bf

* 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.

--- a/src/xselect.c	Fri Jan 07 16:12:34 2005 +0000
+++ b/src/xselect.c	Fri Jan 07 16:59:57 2005 +0000
@@ -1383,7 +1383,7 @@
       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 @@
    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 @@
       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 (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 @@
   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)))