summaryrefslogtreecommitdiff
path: root/gtk/gtktextdisplay.c
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2000-07-25 20:38:35 +0000
committerTor Lillqvist <tml@src.gnome.org>2000-07-25 20:38:35 +0000
commit20e675e1a35678158d1e0cd43cf56c22529c29f3 (patch)
tree88917097a92350bdfc63bd1904913a82db1ec6c8 /gtk/gtktextdisplay.c
parent5ac61d3eeebe1947c4a3c5fbab3a89bb4d124a59 (diff)
downloadgtk+-20e675e1a35678158d1e0cd43cf56c22529c29f3.tar.gz
Generate gtk/makefile.mingw.
2000-07-25 Tor Lillqvist <tml@iki.fi> * configure.in: Generate gtk/makefile.mingw. * config.h.win32: Add GETTEXT_PACKAGE. * gdk/gdk.def * gtk/gtk.def: Updates. * gdk/gdkfont.h * gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't need them any longer. * gdk/gdkinput.h: Mark gdk_core_pointer for export/import. * gdk/win32/*.c: More work. * gdk/win32/gdkpango-win32.c: New file. * gtk/makefile.mingw.in: New file * gtk/makefile.cygwin: Removed * gtk/Makefile.am: Update accordingly. * gtk/gtkmain.c: Use gtk_win32_get_installation_directory(). * gtk/gtktextdisplay.c: No need to include pangox.h, pango.h is enough. * gtk/gtktypeutils.c: Mark glib_debug_objects for import.
Diffstat (limited to 'gtk/gtktextdisplay.c')
-rw-r--r--gtk/gtktextdisplay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 8826c7775d..8fa44b3ff1 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -50,8 +50,8 @@
#include "gtktextdisplay.h"
#include "gtktextiterprivate.h"
-#include <pango/pangox.h>
-#include "x11/gdkx.h"
+
+#include <pango/pango.h>
typedef struct _GtkTextRenderState GtkTextRenderState;