comparison src/objects-gtk.c @ 578:190b164ddcac

[xemacs-hg @ 2001-05-25 11:26:50 by ben] device-msw.c, eldap.c, emodules.c, hpplay.c, process-unix.c, sound.h, tooltalk.c, win32.c: Revert Martin's attempted compile-warnings fix. It does fix the warnings, but not the right way. We are trying to eliminate the raw use of `char' and `unsigned char' absolutely everywhere. There is never an occasion to reintroduce these. buffer.h: Instead, we fix these macros so they don't care about the type of their lvalues. We already do this for the non-C-string equivalents of these, and it's correct because it should be OK to pass in an SBufbyte *, for example. In any case, we do not need any type-correctness checking here -- errors will be caught for sure as soon as we remove the -Wno-sign-compare switch. mule-charset.c: Use invalid_argument, not generic signal_error (Qerror, ). alloc.c, chartab.c, console-gtk.c, console-msw.c, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console.c, console.h, device-x.c, device.c, elhash.c, eval.c, faces.c, faces.h, fns.c, glyphs.c, glyphs.h, gui.c, gui.h, lisp.h, lread.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, process-unix.c, rangetab.c, search.c, specifier.c, toolbar.c, window.c, window.h: Rename Error_behavior to Error_Behavior, to be consistent with general naming practices (Lisp_Object, Char_Binary, etc.).
author ben
date Fri, 25 May 2001 11:27:01 +0000
parents 183866b06e0b
children fdefd0186b75
comparison
equal deleted inserted replaced
577:910449c92002 578:190b164ddcac
71 return (0); 71 return (0);
72 } 72 }
73 73
74 int 74 int
75 gtk_parse_nearest_color (struct device *d, GdkColor *color, Bufbyte *name, 75 gtk_parse_nearest_color (struct device *d, GdkColor *color, Bufbyte *name,
76 Bytecount len, Error_behavior errb) 76 Bytecount len, Error_Behavior errb)
77 { 77 {
78 GdkColormap *cmap; 78 GdkColormap *cmap;
79 GdkVisual *visual; 79 GdkVisual *visual;
80 int result; 80 int result;
81 81
109 return result; 109 return result;
110 } 110 }
111 111
112 static int 112 static int
113 gtk_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name, 113 gtk_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name,
114 Lisp_Object device, Error_behavior errb) 114 Lisp_Object device, Error_Behavior errb)
115 { 115 {
116 GdkColor color; 116 GdkColor color;
117 int result; 117 int result;
118 118
119 result = gtk_parse_nearest_color (XDEVICE (device), &color, 119 result = gtk_parse_nearest_color (XDEVICE (device), &color,
213 /* font instances */ 213 /* font instances */
214 /************************************************************************/ 214 /************************************************************************/
215 215
216 static int 216 static int
217 gtk_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name, 217 gtk_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
218 Lisp_Object device, Error_behavior errb) 218 Lisp_Object device, Error_Behavior errb)
219 { 219 {
220 GdkFont *gf; 220 GdkFont *gf;
221 XFontStruct *xf; 221 XFontStruct *xf;
222 const char *extname; 222 const char *extname;
223 223
340 /* Forward declarations for X specific functions at the end of the file */ 340 /* Forward declarations for X specific functions at the end of the file */
341 Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp); 341 Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp);
342 static Lisp_Object __gtk_list_fonts_internal (const char *pattern); 342 static Lisp_Object __gtk_list_fonts_internal (const char *pattern);
343 343
344 static Lisp_Object 344 static Lisp_Object
345 gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_behavior errb) 345 gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_Behavior errb)
346 { 346 {
347 if (NILP (FONT_INSTANCE_GTK_TRUENAME (f))) 347 if (NILP (FONT_INSTANCE_GTK_TRUENAME (f)))
348 { 348 {
349 FONT_INSTANCE_GTK_TRUENAME (f) = __get_gtk_font_truename (FONT_INSTANCE_GTK_FONT (f), 1); 349 FONT_INSTANCE_GTK_TRUENAME (f) = __get_gtk_font_truename (FONT_INSTANCE_GTK_FONT (f), 1);
350 350