diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-07-19 13:36:52 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-19 13:36:52 +0000 |
| commit | b1d1801875d9db5004f3bb29e9ec8d848a9f5d85 (patch) | |
| tree | 31e46183fb67636491c2722b043bbaef1f06f45c | |
| parent | 366f08814a18fd2a4717105f7e65e3a562b70ecf (diff) | |
| download | gtk+-b1d1801875d9db5004f3bb29e9ec8d848a9f5d85.tar.gz | |
When looking up a font XID, add the XID_FONT_BIT. (#348001)
2006-07-19 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
up a font XID, add the XID_FONT_BIT. (#348001)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gdk/x11/gdkx.h | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2006-07-19 Matthias Clasen <mclasen@redhat.com> + + * gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking + up a font XID, add the XID_FONT_BIT. (#348001) + 2006-07-19 Richard Hult <richard@imendio.com> * gdk/quartz/GdkQuartzView.c ([GdkQuartzView -drawRect:]): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0d1560386f..13f5d860b3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-07-19 Matthias Clasen <mclasen@redhat.com> + + * gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking + up a font XID, add the XID_FONT_BIT. (#348001) + 2006-07-19 Richard Hult <richard@imendio.com> * gdk/quartz/GdkQuartzView.c ([GdkQuartzView -drawRect:]): diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 1e9f1f1fb1..f07a5883e7 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -187,7 +187,7 @@ void gdk_x11_register_standard_event_type (GdkDisplay *display, gpointer gdk_x11_font_get_xfont (GdkFont *font); #define GDK_FONT_XFONT(font) (gdk_x11_font_get_xfont (font)) -#define gdk_font_lookup_for_display(display, xid) ((GdkFont*) gdk_xid_table_lookup_for_display (display, xid)) +#define gdk_font_lookup_for_display(display, xid) ((GdkFont*) gdk_xid_table_lookup_for_display (display, ((xid)|XID_FONT_BIT))) #endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */ |