diff --git a/src/wxxt/src/GDI-Classes/Font.cc b/src/wxxt/src/GDI-Classes/Font.cc index 76a07a553e..e528952500 100644 --- a/src/wxxt/src/GDI-Classes/Font.cc +++ b/src/wxxt/src/GDI-Classes/Font.cc @@ -737,7 +737,11 @@ static wxFontStruct *wxLoadQueryNearestAAFont(const char *name, : XFT_SLANT_ROMAN)); ex_tags[0] = NULL; + ex_types[0] = 0; + ex_vals[0] = 0; ex_tags[1] = NULL; + ex_types[1] = 0; + ex_vals[1] = 0; switch (smoothing) { case wxSMOOTHING_OFF: diff --git a/src/wxxt/src/XWidgets/xwTabString.c b/src/wxxt/src/XWidgets/xwTabString.c index 3c4e672a41..1c4dd99e4d 100644 --- a/src/wxxt/src/XWidgets/xwTabString.c +++ b/src/wxxt/src/XWidgets/xwTabString.c @@ -23,7 +23,7 @@ extern wxExtFont wxFindAAFont(Display *dpy, wxExtFont xfont, int c); static int leading_utf8_len(char *s, int len) { long ipos; - scheme_utf8_decode(s, 0, len, + scheme_utf8_decode((const unsigned char *)s, 0, len, NULL, 0, 1, &ipos, 0, '?'); return ipos; @@ -55,12 +55,12 @@ static int xdoDraw(measure, font, long ulen; 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) us = usbuf; else 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 if (!xfont) diff --git a/src/wxxt/utils/image/src/wx_xbm.cc b/src/wxxt/utils/image/src/wx_xbm.cc index b728a71e38..e3892f19b7 100644 --- a/src/wxxt/utils/image/src/wx_xbm.cc +++ b/src/wxxt/utils/image/src/wx_xbm.cc @@ -143,7 +143,7 @@ int wxImage::LoadXBM(char *fname, int /* nc */) /* read/convert the image data */ for (i=0, pix=pic; i