Mercurial > hg > xemacs-beta

comparison src/gtk-xemacs.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents 4dee0387b9de
children
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
176 FROB (face, Qbackground, xemacs_gtk_convert_color (&style->bg_slot[GTK_STATE_NORMAL], FRAME_GTK_SHELL_WIDGET (f))); \ 176 FROB (face, Qbackground, xemacs_gtk_convert_color (&style->bg_slot[GTK_STATE_NORMAL], FRAME_GTK_SHELL_WIDGET (f))); \
177 if (style->rc_style && style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]) \ 177 if (style->rc_style && style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]) \
178 { \ 178 { \
179 FROB (Vdefault_face, Qbackground_pixmap, \ 179 FROB (Vdefault_face, Qbackground_pixmap, \
180 Fmake_image_instance (build_cistring (style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]), \ 180 Fmake_image_instance (build_cistring (style->rc_style->bg_pixmap_name[GTK_STATE_NORMAL]), \
181 f->device, Qnil, make_int (5))); \ 181 f->device, Qnil, make_fixnum (5))); \
182 } \ 182 } \
183 else \ 183 else \
184 { \ 184 { \
185 FROB (Vdefault_face, Qbackground_pixmap, Qnil); \ 185 FROB (Vdefault_face, Qbackground_pixmap, Qnil); \
186 } \ 186 } \
212 vsize = slider_size + (style->klass->xthickness * 2); 212 vsize = slider_size + (style->klass->xthickness * 2);
213 213
214 style = gtk_style_attach (style, 214 style = gtk_style_attach (style,
215 GTK_WIDGET (DEVICE_GTK_APP_SHELL (XDEVICE (FRAME_DEVICE (f))))->window); 215 GTK_WIDGET (DEVICE_GTK_APP_SHELL (XDEVICE (FRAME_DEVICE (f))))->window);
216 216
217 Fadd_spec_to_specifier (Vscrollbar_width, make_int (vsize), frame, Qnil, Qnil); 217 Fadd_spec_to_specifier (Vscrollbar_width, make_fixnum (vsize), frame, Qnil, Qnil);
218 Fadd_spec_to_specifier (Vscrollbar_height, make_int (hsize), frame, Qnil, Qnil); 218 Fadd_spec_to_specifier (Vscrollbar_height, make_fixnum (hsize), frame, Qnil, Qnil);
219 } 219 }
220 #endif /* HAVE_SCROLLBARS */ 220 #endif /* HAVE_SCROLLBARS */
221 221
222 #ifdef HAVE_TOOLBARS 222 #ifdef HAVE_TOOLBARS
223 extern Lisp_Object Vtoolbar_shadow_thickness; 223 extern Lisp_Object Vtoolbar_shadow_thickness;
228 Lisp_Object frame; 228 Lisp_Object frame;
229 GtkStyleClass *klass = (GtkStyleClass *) style->klass; 229 GtkStyleClass *klass = (GtkStyleClass *) style->klass;
230 230
231 frame = wrap_frame (f); 231 frame = wrap_frame (f);
232 232
233 Fadd_spec_to_specifier (Vtoolbar_shadow_thickness, make_int (klass->xthickness), 233 Fadd_spec_to_specifier (Vtoolbar_shadow_thickness, make_fixnum (klass->xthickness),
234 Qnil, list2 (Qgtk, Qdefault), Qprepend); 234 Qnil, list2 (Qgtk, Qdefault), Qprepend);
235 } 235 }
236 #endif /* HAVE_TOOLBARS */ 236 #endif /* HAVE_TOOLBARS */
237 237
238 static void 238 static void