suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up a few leftover gcc4 compiler warnings

Browse Source 
svn: r2838
This commit is contained in:
Matthew Flatt 2006-04-28 17:17:03 +00:00
parent e83b73e1f9
commit a377f0cc46
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wxxt/src/GDI-Classes/Font.cc
View File

@ -737,7 +737,11 @@ static wxFontStruct *wxLoadQueryNearestAAFont(const char *name,
: XFT_SLANT_ROMAN)); : XFT_SLANT_ROMAN));
ex_tags[0] = NULL; ex_tags[0] = NULL;
ex_types[0] = 0;
ex_vals[0] = 0;
ex_tags[1] = NULL; ex_tags[1] = NULL;
ex_types[1] = 0;
ex_vals[1] = 0;
switch (smoothing) { switch (smoothing) {
case wxSMOOTHING_OFF: case wxSMOOTHING_OFF:

6
src/wxxt/src/XWidgets/xwTabString.c
View File

@ -23,7 +23,7 @@ extern wxExtFont wxFindAAFont(Display *dpy, wxExtFont xfont, int c);
static int leading_utf8_len(char *s, int len) static int leading_utf8_len(char *s, int len)
{ {
long ipos; long ipos;
scheme_utf8_decode(s, 0, len, scheme_utf8_decode((const unsigned char *)s, 0, len,
NULL, 0, 1, NULL, 0, 1,
&ipos, 0, '?'); &ipos, 0, '?');
return ipos; return ipos;
@ -55,12 +55,12 @@ static int xdoDraw(measure, font,
long ulen; long ulen;
int width = 0; int width = 0;
ulen = scheme_utf8_decode_all(string, length, NULL, '?'); ulen = scheme_utf8_decode_all((unsigned char *)string, length, NULL, '?');
if (ulen <= WXTAB_BUF_SIZE) if (ulen <= WXTAB_BUF_SIZE)
us = usbuf; us = usbuf;
else else
us = (unsigned int *)XtMalloc(ulen * sizeof(unsigned int)); us = (unsigned int *)XtMalloc(ulen * sizeof(unsigned int));
ulen = scheme_utf8_decode_all(string, length, us, '?'); ulen = scheme_utf8_decode_all((unsigned char *)string, length, us, '?');
#ifdef WX_USE_XFT #ifdef WX_USE_XFT
if (!xfont) if (!xfont)

2
src/wxxt/utils/image/src/wx_xbm.cc
View File

@ -143,7 +143,7 @@ int wxImage::LoadXBM(char *fname, int /* nc */)
/* read/convert the image data */ /* read/convert the image data */
for (i=0, pix=pic; i<h; i++) { for (i=0, pix=pic; i<h; i++) {
for (j=0,bit=0; j<w; j++, pix++, bit = ++bit&7) { for (j=0,bit=0; j<w; j++, pix++, bit = ((bit + 1) & 0x7)) {
if (!bit) { if (!bit) {
/* get next byte from file. we're already positioned at it */ /* get next byte from file. we're already positioned at it */