summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkdrawable-x11.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-08-02 17:50:09 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-08-02 17:50:09 +0000
commit88c1c94651750789dcad613ee8b09024df142ba2 (patch)
treec7ee5d339304d0b75d98d79a0b9bfd25918ed25a /gdk/x11/gdkdrawable-x11.h
parentc466752212dc8aed884aa00877c5d32ecb081f12 (diff)
downloadgtk+-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/gdkdrawable-x11.h')
-rw-r--r--gdk/x11/gdkdrawable-x11.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index 0d4185b6f1..ea99938b3c 100644
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/gdk/x11/gdkdrawable-x11.h
@@ -32,10 +32,7 @@
#include <gdk/gdkdrawable.h>
#include <X11/Xlib.h>
-
-#ifdef HAVE_XFT
#include <X11/Xft/Xft.h>
-#endif
#ifdef __cplusplus
extern "C" {
@@ -65,11 +62,7 @@ struct _GdkDrawableImplX11
Window xid;
GdkScreen *screen;
-#ifdef HAVE_XFT2
XftDraw *xft_draw;
-#elif defined (HAVE_XFT)
- Picture picture;
-#endif
};
struct _GdkDrawableImplX11Class