Merge no-flicker branch into HEAD

2000-03-28 01:24:44 +00:00
parent 4238d406e9
commit 8098546227
68 changed files with 9281 additions and 1896 deletions
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@ -29,9 +29,9 @@
 #include "gdk.h"		/* For gdk_flush() */
 #include "gdkim.h"
 #include "gdkpixmap.h"
-#include "gdkprivate.h"
 #include "gdki18n.h"
-#include "gdkx.h"
+#include "gdkinternals.h"
+#include "gdkprivate-x11.h"

 #if HAVE_CONFIG_H
 #  include <config.h>