Commit 28de9c69 authored by Owen Taylor's avatar Owen Taylor

Ignore gdk_gc_set_font if font is a fontset. (Actually, gdk_gc_set_font

is completely useless now...)
                                        -owt
parent ef3f3731
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net> Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in * gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu. gtk_style_detach witch crashed script_fu.
......
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net> Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in * gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu. gtk_style_detach witch crashed script_fu.
......
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net> Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in * gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu. gtk_style_detach witch crashed script_fu.
......
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net> Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in * gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu. gtk_style_detach witch crashed script_fu.
......
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net> Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in * gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu. gtk_style_detach witch crashed script_fu.
......
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net> Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in * gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu. gtk_style_detach witch crashed script_fu.
......
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net> Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in * gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu. gtk_style_detach witch crashed script_fu.
......
...@@ -371,11 +371,14 @@ gdk_gc_set_font (GdkGC *gc, ...@@ -371,11 +371,14 @@ gdk_gc_set_font (GdkGC *gc,
g_return_if_fail (gc != NULL); g_return_if_fail (gc != NULL);
g_return_if_fail (font != NULL); g_return_if_fail (font != NULL);
gc_private = (GdkGCPrivate*) gc; if (font->type == GDK_FONT_FONT)
font_private = (GdkFontPrivate*) font; {
gc_private = (GdkGCPrivate*) gc;
XSetFont (gc_private->xdisplay, gc_private->xgc, font_private = (GdkFontPrivate*) font;
((XFontStruct *) font_private->xfont)->fid);
XSetFont (gc_private->xdisplay, gc_private->xgc,
((XFontStruct *) font_private->xfont)->fid);
}
} }
void void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment