comparison src/balloon-x.c @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36
author cvs
date Mon, 13 Aug 2007 11:35:02 +0200
parents 8de8e3f6228a
children 79c6ff3eef26
comparison
equal deleted inserted replaced
441:72a7cfa4a488 442:abe6d1db359e
30 #include "balloon_help.h" 30 #include "balloon_help.h"
31 31
32 /* #### start of hack */ 32 /* #### start of hack */
33 33
34 static unsigned long 34 static unsigned long
35 alloc_color (Display* dpy, CONST char* colorname, int light) 35 alloc_color (Display* dpy, const char* colorname, int light)
36 { 36 {
37 Colormap cmap = DEVICE_X_COLORMAP (XDEVICE(Vdefault_x_device)); 37 Colormap cmap = DEVICE_X_COLORMAP (XDEVICE(Vdefault_x_device));
38 unsigned long pixel = 0; 38 unsigned long pixel = 0;
39 XColor color; 39 XColor color;
40 40
59 } 59 }
60 return pixel; 60 return pixel;
61 } 61 }
62 62
63 static XFontStruct * 63 static XFontStruct *
64 open_font (Display* dpy, CONST char* font_name) 64 open_font (Display* dpy, const char* font_name)
65 { 65 {
66 XFontStruct* fontStruct = NULL; 66 XFontStruct* fontStruct = NULL;
67 67
68 fontStruct = XLoadQueryFont (dpy, font_name ? font_name : "fixed"); 68 fontStruct = XLoadQueryFont (dpy, font_name ? font_name : "fixed");
69 if (fontStruct == NULL) 69 if (fontStruct == NULL)