Practically everything changed.

[~andy/gtk] / gdk / gdk.h

diff --git a/gdk/gdk.h b/gdk/gdk.h
index b661d7a478e33b128b20049878b0a252c0d1687e..b4adf414e7c27768c0d78d172ff3be286bccd1db 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1,4 +1,4 @@
-/* GDK - The GIMP Drawing Kit
+/* GDK - The GTK+ Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -27,6 +27,8 @@
 #ifndef __GDK_H__
 #define __GDK_H__
 
+#define __GDK_H_INSIDE__
+
 #include <gdk/gdkapplaunchcontext.h>
 #include <gdk/gdkcairo.h>
 #include <gdk/gdkcolor.h>
@@ -56,6 +58,8 @@
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
+#undef __GDK_H_INSIDE__
+
 G_BEGIN_DECLS
 
 
@@ -98,7 +102,7 @@ gint gdk_input_add_full        (gint              source,
                           GdkInputCondition condition,
                           GdkInputFunction  function,
                           gpointer          data,
-                          GdkDestroyNotify  destroy);
+                          GDestroyNotify    destroy);
 #endif /* !GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
 #ifndef GDK_DISABLE_DEPRECATED
 gint gdk_input_add       (gint              source,