diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | HACKING | 12 | ||||
| -rw-r--r-- | gdk/gdkpango.c | 11 |
9 files changed, 74 insertions, 12 deletions
@@ -1,3 +1,11 @@ +Fri Nov 30 16:12:21 2001 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix + bad match error when target drawable is not the + same depth as the root window. (#65841) + + * HACKING: Update. + 2001-11-29 Matthias Clasen <matthiasc@poet.de> * gdk/gdkwindow.c: Typo fix. @@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 +>>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e287d9284e..0582dbac3d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Fri Nov 30 16:12:21 2001 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix + bad match error when target drawable is not the + same depth as the root window. (#65841) + + * HACKING: Update. + 2001-11-29 Matthias Clasen <matthiasc@poet.de> * gdk/gdkwindow.c: Typo fix. @@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 +>>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e287d9284e..0582dbac3d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Nov 30 16:12:21 2001 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix + bad match error when target drawable is not the + same depth as the root window. (#65841) + + * HACKING: Update. + 2001-11-29 Matthias Clasen <matthiasc@poet.de> * gdk/gdkwindow.c: Typo fix. @@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 +>>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e287d9284e..0582dbac3d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri Nov 30 16:12:21 2001 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix + bad match error when target drawable is not the + same depth as the root window. (#65841) + + * HACKING: Update. + 2001-11-29 Matthias Clasen <matthiasc@poet.de> * gdk/gdkwindow.c: Typo fix. @@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 +>>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e287d9284e..0582dbac3d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Nov 30 16:12:21 2001 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix + bad match error when target drawable is not the + same depth as the root window. (#65841) + + * HACKING: Update. + 2001-11-29 Matthias Clasen <matthiasc@poet.de> * gdk/gdkwindow.c: Typo fix. @@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 +>>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e287d9284e..0582dbac3d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Nov 30 16:12:21 2001 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix + bad match error when target drawable is not the + same depth as the root window. (#65841) + + * HACKING: Update. + 2001-11-29 Matthias Clasen <matthiasc@poet.de> * gdk/gdkwindow.c: Typo fix. @@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 +>>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e287d9284e..0582dbac3d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Nov 30 16:12:21 2001 Owen Taylor <otaylor@redhat.com> + + * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix + bad match error when target drawable is not the + same depth as the root window. (#65841) + + * HACKING: Update. + 2001-11-29 Matthias Clasen <matthiasc@poet.de> * gdk/gdkwindow.c: Typo fix. @@ -30,6 +38,7 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld <kristian@planet.nl> assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 +>>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove @@ -1,13 +1,11 @@ -If you want to hack on the Gtk+ project, it will make you life easier -to have the following packages installed: +If you want to hack on the GTK+ project, you'll need to have +the following packages installed: - - GNU autoconf 2.13 + - GNU autoconf 2.52 - GNU automake 1.4 - (Beta releases are at ftp://ftp.cygnus.com/pub/tromey) - - GNU libtool 1.2d + - GNU libtool 1.4 - indent (GNU indent 1.9.1 is known good) - - GNU gettext 10.35 - Available in ftp://alpha.gnu.org/gnu + - GNU gettext 10.40 These should be available by ftp from ftp.gnu.org or any of the fine GNU mirrors. Beta software can be found at alpha.gnu.org. diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 1040068a45..90d7729714 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -77,7 +77,8 @@ gdk_pango_context_get_info (PangoContext *context, gboolean create) } static GdkGC * -gdk_pango_get_gc (PangoContext *context, +gdk_pango_get_gc (GdkDrawable *drawable, + PangoContext *context, PangoColor *fg_color, GdkBitmap *stipple, GdkGC *base_gc) @@ -95,7 +96,7 @@ gdk_pango_get_gc (PangoContext *context, return NULL; } - result = gdk_gc_new (gdk_get_default_root_window ()); + result = gdk_gc_new (drawable); gdk_gc_copy (result, base_gc); if (fg_color) @@ -249,7 +250,7 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable, tmp.green = background->green; } - bg_gc = gdk_pango_get_gc (context, &tmp, stipple, gc); + bg_gc = gdk_pango_get_gc (drawable, context, &tmp, stipple, gc); gdk_draw_rectangle (drawable, bg_gc, TRUE, x + (x_off + logical_rect.x) / PANGO_SCALE, @@ -274,7 +275,7 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable, tmp.green = foreground->green; } - fg_gc = gdk_pango_get_gc (context, fg_set ? &tmp : NULL, + fg_gc = gdk_pango_get_gc (drawable, context, fg_set ? &tmp : NULL, stipple, gc); } else @@ -290,7 +291,7 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable, if (embossed) { PangoColor color = { 65535, 65535, 65535 }; - GdkGC *white_gc = gdk_pango_get_gc (context, &color, stipple, fg_gc); + GdkGC *white_gc = gdk_pango_get_gc (drawable, context, &color, stipple, fg_gc); gdk_draw_glyphs (drawable, white_gc, run->item->analysis.font, gx + 1, gy + 1, |