diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-02 17:50:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-02 17:50:09 +0000 |
| commit | 88c1c94651750789dcad613ee8b09024df142ba2 (patch) | |
| tree | c7ee5d339304d0b75d98d79a0b9bfd25918ed25a /gdk/x11/gdkpixmap-x11.c | |
| parent | c466752212dc8aed884aa00877c5d32ecb081f12 (diff) | |
| download | gtk+-88c1c94651750789dcad613ee8b09024df142ba2.tar.gz | |
Requires glib-2.3.0, pango-1.2.0.
Sat Aug 2 12:53:16 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Requires glib-2.3.0, pango-1.2.0.
* configure.in: Require Xft version 2,
remove code for handling older versions of pango and Xft.
Many miscellaneous improvements to X checks
* acinclude.m4: Add GTK_ADD_LIB() macro for adding
a library to a variable, avoiding dups.
* gdk/x11/gdkfont-x11.c (gdk_font_from_description_for_display):
Always load "fixed"
* gdk/x11/gdk*-x11.[ch]: Remove support for Xft1 and
for pangox.
Diffstat (limited to 'gdk/x11/gdkpixmap-x11.c')
| -rw-r--r-- | gdk/x11/gdkpixmap-x11.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 06d19cd8a9..f28ad72af5 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -129,19 +129,10 @@ gdk_pixmap_impl_x11_finalize (GObject *object) if (!display->closed) { -#ifdef HAVE_XFT - { - GdkDrawableImplX11 *draw_impl = GDK_DRAWABLE_IMPL_X11 (impl); + GdkDrawableImplX11 *draw_impl = GDK_DRAWABLE_IMPL_X11 (impl); -#ifdef HAVE_XFT2 - if (draw_impl->xft_draw) - XftDrawDestroy (draw_impl->xft_draw); -#else /* !HAVE_XFT2 */ - if (draw_impl->picture) - XRenderFreePicture (GDK_DISPLAY_XDISPLAY (display), draw_impl->picture); -#endif /* HAVE_XFT2 */ - } -#endif /* HAVE_XFT */ + if (draw_impl->xft_draw) + XftDrawDestroy (draw_impl->xft_draw); if (!impl->is_foreign) XFreePixmap (GDK_DISPLAY_XDISPLAY (display), GDK_PIXMAP_XID (wrapper)); |