Mercurial > hg > xemacs-beta
diff src/objects-gtk.c @ 2054:91d4c8c65a0f
[xemacs-hg @ 2004-05-02 04:06:51 by malcolmp]
Fix warnings and errors when building GTK using C++ and --use-union-type.
| author | malcolmp |
|---|---|
| date | Sun, 02 May 2004 04:07:01 +0000 |
| parents | a8d8f419b459 |
| children | 04bc9d2f42c7 |
line wrap: on
line diff
--- a/src/objects-gtk.c Sat May 01 21:50:40 2004 +0000 +++ b/src/objects-gtk.c Sun May 02 04:07:01 2004 +0000 @@ -230,7 +230,7 @@ return 0; } - xf = GDK_FONT_XFONT (gf); + xf = (XFontStruct*) GDK_FONT_XFONT (gf); /* Don't allocate the data until we're sure that we will succeed, or the finalize method may get fucked. */ @@ -507,7 +507,7 @@ if (gtk_font_spec_matches_charset (XDEVICE (device), charset, intname, Qnil, 0, -1, 0)) { - result = make_string ((char *) intname, intlen); + result = make_string (intname, intlen); break; } } @@ -556,12 +556,12 @@ { if (names->data) { - if (valid_font_name_p (dpy, names->data)) + if (valid_font_name_p (dpy, (char*) names->data)) { if (!expandp) { /* They want the wildcarded version */ - font_name = build_string (names->data); + font_name = build_string ((char*) names->data); } else { @@ -569,7 +569,7 @@ int nnames = 0; char **x_font_names = 0; - x_font_names = XListFonts (dpy, names->data, 1, &nnames); + x_font_names = XListFonts (dpy, (char*) names->data, 1, &nnames); if (x_font_names) { font_name = build_string (x_font_names[0]);