x11: Store GDK name in xsettings hash table

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

diff --git a/gdk/gdkconfig.h.win32 b/gdk/gdkconfig.h.win32
index 7bd668e81e5c9d07547fbf370a6ee1fa13652fcd..13022e88eca97646f57856d4eadeb4a158bc84f3 100644 (file)
--- a/gdk/gdkconfig.h.win32
+++ b/gdk/gdkconfig.h.win32
@@ -1,31 +1,35 @@
 /* gdkconfig.h
  *
- * This is a pre-generated file.
+ * This is a generated file.  Please modify `configure.ac'
  */
 
-#ifndef GDKCONFIG_H
-#define GDKCONFIG_H
+#ifndef __GDKCONFIG_H__
+#define __GDKCONFIG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
 
-#ifndef GSEAL
-/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */
-#  ifdef GSEAL_ENABLE
-#    define GSEAL(ident)      _g_sealed__ ## ident
-#  else
-#    define GSEAL(ident)      ident
-#  endif
-#endif /* !GSEAL */
+#include <glib.h>
 
-#define GDK_WINDOWING_WIN32
+G_BEGIN_DECLS
+
+/* These macros are used to mark deprecated functions in GDK and
+ * GTK+ headers, and thus have to be exposed in installed headers.
+ * But please do *not* use them in other projects. Instead, use
+ * G_DEPRECATED or define your own wrappers around it.
+ */
 
-#define GDK_HAVE_WCHAR_H 1
-#define GDK_HAVE_WCTYPE_H 1
+#ifdef GDK_DISABLE_DEPRECATION_WARNINGS
+#define GDK_DEPRECATED
+#define GDK_DEPRECATED_FOR(f)
+#else
+#define GDK_DEPRECATED G_DEPRECATED
+#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
+#endif
+
+#define GDK_WINDOWING_WIN32
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* GDKCONFIG_H */
+#endif  /* __GDKCONFIG_H__ */