AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Correct Gdk backend import paths and related gtk-doc

See merge request GNOME/gtk!1197
This commit is contained in:
Emmanuele Bassi 2019-11-18 10:27:32 +00:00
commit 9a88d17ef2
22 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gdk/gdk4-sections.txt
View File

@ -939,8 +939,6 @@ gdk_surface_impl_x11_get_type
</SECTION>
<SECTION>
<INCLUDE>gdk/gdkwayland.h</INCLUDE>
<TITLE>Wayland Interaction</TITLE>
<FILE>wayland_interaction</FILE>
gdk_wayland_seat_get_wl_seat
gdk_wayland_device_get_wl_keyboard

2
gdk/broadway/gdkbroadwaycursor.h
View File

@ -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>

2
gdk/broadway/gdkbroadwaydisplay.h
View File

@ -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>

2
gdk/broadway/gdkbroadwaydisplaymanager.h
View File

@ -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>

2
gdk/broadway/gdkbroadwaymonitor.h
View File

@ -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>

2
gdk/quartz/gdkquartzcursor.h
View File

@ -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>

2
gdk/quartz/gdkquartzdevice-core.h
View File

@ -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>

2
gdk/quartz/gdkquartzdevicemanager-core.h
View File

@ -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>

2
gdk/quartz/gdkquartzdisplay.h
View File

@ -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>

2
gdk/quartz/gdkquartzdisplaymanager.h
View File

@ -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>

2
gdk/quartz/gdkquartzdnd.h
View File

@ -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>

2
gdk/quartz/gdkquartzkeys.h
View File

@ -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>

2
gdk/quartz/gdkquartzmonitor.h
View File

@ -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>

2
gdk/quartz/gdkquartzscreen.h
View File

@ -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

2
gdk/quartz/gdkquartzsurface.h
View File

@ -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>

2
gdk/quartz/gdkquartzutils.h
View File

@ -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>

6
gdk/wayland/gdkdisplay-wayland.c
View File

@ -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

2
gdk/wayland/gdkwaylanddevice.h
View File

@ -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>

2
gdk/wayland/gdkwaylanddisplay.h
View File

@ -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>

2
gdk/wayland/gdkwaylandglcontext.h
View File

@ -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>

2
gdk/wayland/gdkwaylandmonitor.h
View File

@ -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>

2
gdk/wayland/gdkwaylandsurface.h
View File

@ -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>