Merge branch 'gdk-backend-imports' into 'master'

Correct Gdk backend import paths and related gtk-doc

See merge request GNOME/gtk!1197

21 files changed, 24 insertions, 22 deletions

diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h
index 88d451a54a..6b5fcc8626 100644
--- a/gdk/broadway/gdkbroadwaycursor.h
+++ b/gdk/broadway/gdkbroadwaycursor.h
@@ -26,7 +26,7 @@
 #define __GDK_BROADWAY_CURSOR_H__
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/broadway/gdkbroadwaydisplay.h b/gdk/broadway/gdkbroadwaydisplay.h
index 4f4931a4ed..e1e0ffb10d 100644
--- a/gdk/broadway/gdkbroadwaydisplay.h
+++ b/gdk/broadway/gdkbroadwaydisplay.h
@@ -19,7 +19,7 @@
 #define __GDK_BROADWAY_DISPLAY_H__
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h
index 0818af293d..355869d9df 100644
--- a/gdk/broadway/gdkbroadwaydisplaymanager.h
+++ b/gdk/broadway/gdkbroadwaydisplaymanager.h
@@ -21,7 +21,7 @@
 #define __GDK_BROADWAY_DISPLAY_MANAGER_H__
 
 #if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/broadway/gdkbroadwaymonitor.h b/gdk/broadway/gdkbroadwaymonitor.h
index 4fe9e6a7e5..36714ff55a 100644
--- a/gdk/broadway/gdkbroadwaymonitor.h
+++ b/gdk/broadway/gdkbroadwaymonitor.h
@@ -23,7 +23,7 @@
 #define __GDK_BROADWAY_MONITOR_H__
 
 #if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkbroadway.h> can be included directly."
+#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>
diff --git a/gdk/quartz/gdkquartzcursor.h b/gdk/quartz/gdkquartzcursor.h
index d6fa967fcc..0938eeb065 100644
--- a/gdk/quartz/gdkquartzcursor.h
+++ b/gdk/quartz/gdkquartzcursor.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_CURSOR_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzdevice-core.h b/gdk/quartz/gdkquartzdevice-core.h
index 9e412eaeee..9b320f60b7 100644
--- a/gdk/quartz/gdkquartzdevice-core.h
+++ b/gdk/quartz/gdkquartzdevice-core.h
@@ -19,7 +19,7 @@
 #define __GDK_QUARTZ_DEVICE_CORE_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzdevicemanager-core.h b/gdk/quartz/gdkquartzdevicemanager-core.h
index 018c858249..8ab4966cc1 100644
--- a/gdk/quartz/gdkquartzdevicemanager-core.h
+++ b/gdk/quartz/gdkquartzdevicemanager-core.h
@@ -19,7 +19,7 @@
 #define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzdisplay.h b/gdk/quartz/gdkquartzdisplay.h
index 4dbd2cbb26..ce709a6b3f 100644
--- a/gdk/quartz/gdkquartzdisplay.h
+++ b/gdk/quartz/gdkquartzdisplay.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_DISPLAY_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzdisplaymanager.h b/gdk/quartz/gdkquartzdisplaymanager.h
index 50bd8b15c4..38fc822cbb 100644
--- a/gdk/quartz/gdkquartzdisplaymanager.h
+++ b/gdk/quartz/gdkquartzdisplaymanager.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_DISPLAY_MANAGER_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h
index fb578e1b8f..d1a618d134 100644
--- a/gdk/quartz/gdkquartzdnd.h
+++ b/gdk/quartz/gdkquartzdnd.h
@@ -20,7 +20,7 @@
 #define __GDK_QUARTZ_DND_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzkeys.h b/gdk/quartz/gdkquartzkeys.h
index f35612e36a..86fe6580bf 100644
--- a/gdk/quartz/gdkquartzkeys.h
+++ b/gdk/quartz/gdkquartzkeys.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_KEYS_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzmonitor.h b/gdk/quartz/gdkquartzmonitor.h
index 01dd9ea858..92a619e935 100644
--- a/gdk/quartz/gdkquartzmonitor.h
+++ b/gdk/quartz/gdkquartzmonitor.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_MONITOR_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>
diff --git a/gdk/quartz/gdkquartzscreen.h b/gdk/quartz/gdkquartzscreen.h
index 87a6e2eeb2..245068df25 100644
--- a/gdk/quartz/gdkquartzscreen.h
+++ b/gdk/quartz/gdkquartzscreen.h
@@ -20,7 +20,7 @@
 #define __GDK_QUARTZ_SCREEN_H__
 
 #if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzsurface.h b/gdk/quartz/gdkquartzsurface.h
index a37cb37c1d..5bfd8d5062 100644
--- a/gdk/quartz/gdkquartzsurface.h
+++ b/gdk/quartz/gdkquartzsurface.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_SURFACE_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzutils.h b/gdk/quartz/gdkquartzutils.h
index 3f05599612..12feec3b86 100644
--- a/gdk/quartz/gdkquartzutils.h
+++ b/gdk/quartz/gdkquartzutils.h
@@ -21,7 +21,7 @@
 #define __GDK_QUARTZ_UTILS_H__
 
 #if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkquartz.h> can be included directly."
+#error "Only <gdk/quartz/gdkquartz.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 9f1fa5b380..56ba3d1134 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -61,10 +61,12 @@
  * SECTION:wayland_interaction
  * @Short_description: Wayland backend-specific functions
  * @Title: Wayland Interaction
+ * @Include: gdk/wayland/gdkwayland.h
  *
  * The functions in this section are specific to the GDK Wayland backend.
- * To use them, you need to include the `<gdk/gdkwayland.h>` header and use
- * the Wayland-specific pkg-config `gtk4-wayland` file to build your application.
+ * To use them, you need to include the `<gdk/wayland/gdkwayland.h>` header and
+ * use the Wayland-specific pkg-config `gtk4-wayland` file to build your
+ * application.
  *
  * To make your code compile with other GDK backends, guard backend-specific
  * calls by an ifdef as follows. Since GDK may be built with multiple
diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h
index a828084b42..7bb843e1db 100644
--- a/gdk/wayland/gdkwaylanddevice.h
+++ b/gdk/wayland/gdkwaylanddevice.h
@@ -19,7 +19,7 @@
 #define __GDK_WAYLAND_DEVICE_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index c6f3b24747..99dfe47775 100644
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -19,7 +19,7 @@
 #define __GDK_WAYLAND_DISPLAY_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/wayland/gdkwaylandglcontext.h b/gdk/wayland/gdkwaylandglcontext.h
index a06586e158..1e99d01b30 100644
--- a/gdk/wayland/gdkwaylandglcontext.h
+++ b/gdk/wayland/gdkwaylandglcontext.h
@@ -23,7 +23,7 @@
 #define __GDK_WAYLAND_GL_CONTEXT_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/wayland/gdkwaylandmonitor.h b/gdk/wayland/gdkwaylandmonitor.h
index cbc4bf50c9..8ad95128b5 100644
--- a/gdk/wayland/gdkwaylandmonitor.h
+++ b/gdk/wayland/gdkwaylandmonitor.h
@@ -23,7 +23,7 @@
 #define __GDK_WAYLAND_MONITOR_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>
diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h
index d236007900..1c4f057a74 100644
--- a/gdk/wayland/gdkwaylandsurface.h
+++ b/gdk/wayland/gdkwaylandsurface.h
@@ -19,7 +19,7 @@
 #define __GDK_WAYLAND_SURFACE_H__
 
 #if !defined (__GDKWAYLAND_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkwayland.h> can be included directly."
+#error "Only <gdk/wayland/gdkwayland.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>