x11: Use _gdk_x11_get_xatom_for_display_printf()

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

diff --git a/gdk/gdkversionmacros.h.in b/gdk/gdkversionmacros.h.in
index 1871455e0c50cd0836bc41f8b5f0d504dcd85606..fa56f9fa324f819106b9377d555ea579f39b45e5 100644 (file)
--- a/gdk/gdkversionmacros.h.in
+++ b/gdk/gdkversionmacros.h.in
@@ -30,6 +30,14 @@
 #define GDK_MINOR_VERSION (@GTK_MINOR_VERSION@)
 #define GDK_MICRO_VERSION (@GTK_MICRO_VERSION@)
 
+/**
+ * GDK_DISABLE_DEPRECATION_WARNINGS:
+ *
+ * A macro that should be defined before including the gdk.h header.
+ * If it is defined, no compiler warnings will be produced for uses
+ * of deprecated GDK and GTK+ APIs.
+ */
+
 #ifdef GDK_DISABLE_DEPRECATION_WARNINGS
 #define GDK_DEPRECATED
 #define GDK_DEPRECATED_FOR(f)
@@ -72,6 +80,26 @@
  */
 #define GDK_VERSION_3_4         (G_ENCODE_VERSION (3, 4))
 
+/**
+ * GDK_VERSION_3_6:
+ *
+ * A macro that evaluates to the 3.6 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 3.6
+ */
+#define GDK_VERSION_3_6         (G_ENCODE_VERSION (3, 6))
+
+/**
+ * GDK_VERSION_3_8:
+ *
+ * A macro that evaluates to the 3.8 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 3.8
+ */
+#define GDK_VERSION_3_8         (G_ENCODE_VERSION (3, 8))
+
 
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
@@ -97,7 +125,7 @@
  * The definition should be one of the predefined GDK version
  * macros: %GDK_VERSION_3_0, %GDK_VERSION_3_2,...
  *
- * This macro defines the lower bound for the GLib API to use.
+ * This macro defines the lower bound for the GDK API to use.
  *
  * If a function has been deprecated in a newer version of GDK,
  * it is possible to use this symbol to avoid the compiler warnings
@@ -106,7 +134,7 @@
  * Since: 3.4
  */
 #ifndef GDK_VERSION_MIN_REQUIRED
-# define GDK_VERSION_MIN_REQUIRED      (GDK_VERSION_PREV_STABLE)
+# define GDK_VERSION_MIN_REQUIRED      (GDK_VERSION_CUR_STABLE)
 #endif
 
 /**
@@ -185,4 +213,32 @@
 # define GDK_AVAILABLE_IN_3_4
 #endif
 
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_6
+# define GDK_DEPRECATED_IN_3_6                GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_3_6_FOR(f)         GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_3_6
+# define GDK_DEPRECATED_IN_3_6_FOR(f)
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_6
+# define GDK_AVAILABLE_IN_3_6                 GDK_UNAVAILABLE(3, 6)
+#else
+# define GDK_AVAILABLE_IN_3_6
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_8
+# define GDK_DEPRECATED_IN_3_8                GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_3_8_FOR(f)         GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_3_8
+# define GDK_DEPRECATED_IN_3_8_FOR(f)
+#endif
+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_8
+# define GDK_AVAILABLE_IN_3_8                 GDK_UNAVAILABLE(3, 8)
+#else
+# define GDK_AVAILABLE_IN_3_8
+#endif
+
 #endif  /* __GDK_VERSION_MACROS_H__ */