forked from AuroraMiddleware/gtk
had a test backward
2000-11-02 Havoc Pennington <hp@redhat.com> * gtk/testgtk.c (create_labels): had a test backward * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC fields, so the dest GC ends up with the correct clip origin, etc. Fixes a bug where colored labels didn't redraw properly.
This commit is contained in:
parent
214c61d575
commit
0ee86faa3c
@ -1,3 +1,12 @@
|
||||
2000-11-02 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (create_labels): had a test backward
|
||||
|
||||
* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC
|
||||
fields, so the dest GC ends up with the correct clip origin,
|
||||
etc. Fixes a bug where colored labels didn't redraw
|
||||
properly.
|
||||
|
||||
2000-11-02 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
|
||||
|
@ -1,3 +1,12 @@
|
||||
2000-11-02 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (create_labels): had a test backward
|
||||
|
||||
* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC
|
||||
fields, so the dest GC ends up with the correct clip origin,
|
||||
etc. Fixes a bug where colored labels didn't redraw
|
||||
properly.
|
||||
|
||||
2000-11-02 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
|
||||
|
@ -1,3 +1,12 @@
|
||||
2000-11-02 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (create_labels): had a test backward
|
||||
|
||||
* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC
|
||||
fields, so the dest GC ends up with the correct clip origin,
|
||||
etc. Fixes a bug where colored labels didn't redraw
|
||||
properly.
|
||||
|
||||
2000-11-02 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
|
||||
|
@ -1,3 +1,12 @@
|
||||
2000-11-02 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (create_labels): had a test backward
|
||||
|
||||
* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC
|
||||
fields, so the dest GC ends up with the correct clip origin,
|
||||
etc. Fixes a bug where colored labels didn't redraw
|
||||
properly.
|
||||
|
||||
2000-11-02 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
|
||||
|
@ -1,3 +1,12 @@
|
||||
2000-11-02 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (create_labels): had a test backward
|
||||
|
||||
* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC
|
||||
fields, so the dest GC ends up with the correct clip origin,
|
||||
etc. Fixes a bug where colored labels didn't redraw
|
||||
properly.
|
||||
|
||||
2000-11-02 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
|
||||
|
@ -1,3 +1,12 @@
|
||||
2000-11-02 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (create_labels): had a test backward
|
||||
|
||||
* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC
|
||||
fields, so the dest GC ends up with the correct clip origin,
|
||||
etc. Fixes a bug where colored labels didn't redraw
|
||||
properly.
|
||||
|
||||
2000-11-02 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
|
||||
|
@ -1,3 +1,12 @@
|
||||
2000-11-02 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/testgtk.c (create_labels): had a test backward
|
||||
|
||||
* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Copy the client-side GC
|
||||
fields, so the dest GC ends up with the correct clip origin,
|
||||
etc. Fixes a bug where colored labels didn't redraw
|
||||
properly.
|
||||
|
||||
2000-11-02 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
|
||||
|
@ -683,9 +683,35 @@ gdk_gc_set_clip_region (GdkGC *gc,
|
||||
void
|
||||
gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc)
|
||||
{
|
||||
GdkGCX11 *x11_src_gc;
|
||||
GdkGCX11 *x11_dst_gc;
|
||||
|
||||
g_return_if_fail (GDK_IS_GC_X11 (dst_gc));
|
||||
g_return_if_fail (GDK_IS_GC_X11 (src_gc));
|
||||
|
||||
x11_dst_gc = GDK_GC_X11 (dst_gc);
|
||||
x11_src_gc = GDK_GC_X11 (src_gc);
|
||||
|
||||
XCopyGC (GDK_GC_XDISPLAY (src_gc), GDK_GC_XGC (src_gc), ~((~1) << GCLastBit),
|
||||
GDK_GC_XGC (dst_gc));
|
||||
|
||||
dst_gc->clip_x_origin = src_gc->clip_x_origin;
|
||||
dst_gc->clip_y_origin = src_gc->clip_y_origin;
|
||||
dst_gc->ts_x_origin = src_gc->ts_x_origin;
|
||||
dst_gc->ts_y_origin = src_gc->ts_y_origin;
|
||||
|
||||
if (src_gc->colormap)
|
||||
g_object_ref (G_OBJECT (src_gc->colormap));
|
||||
|
||||
if (dst_gc->colormap)
|
||||
g_object_unref (G_OBJECT (dst_gc->colormap));
|
||||
|
||||
dst_gc->colormap = src_gc->colormap;
|
||||
|
||||
if (x11_dst_gc->clip_region)
|
||||
gdk_region_destroy (x11_dst_gc->clip_region);
|
||||
|
||||
x11_dst_gc->clip_region = gdk_region_copy (x11_src_gc->clip_region);
|
||||
|
||||
x11_dst_gc->dirty_mask = x11_src_gc->dirty_mask;
|
||||
}
|
||||
|
@ -2113,7 +2113,7 @@ void create_labels (void)
|
||||
"but this _word is <span foreground=\"purple\"><big>purple</big></span>\n"
|
||||
"We like <sup>superscript</sup> and <sub>subscript</sub> too");
|
||||
|
||||
g_return_if_fail (keyval != GDK_s);
|
||||
g_return_if_fail (keyval == GDK_s);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (frame), label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
|
@ -2113,7 +2113,7 @@ void create_labels (void)
|
||||
"but this _word is <span foreground=\"purple\"><big>purple</big></span>\n"
|
||||
"We like <sup>superscript</sup> and <sub>subscript</sub> too");
|
||||
|
||||
g_return_if_fail (keyval != GDK_s);
|
||||
g_return_if_fail (keyval == GDK_s);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (frame), label);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
|
Loading…
Reference in New Issue
Block a user