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

Merge branch 'gdkx-import-doc' into 'master'

Browse Source 
Correct GdkX11 import path in docs and include guards

Closes #2254

See merge request GNOME/gtk!1188
This commit is contained in:
Emmanuele Bassi 2019-11-16 18:19:26 +00:00
commit 1b7c6e5687
16 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -789,8 +789,6 @@ gdk_drop_get_type
</SECTION>
<SECTION>
<INCLUDE>gdk/gdkx.h</INCLUDE>
<TITLE>X Window System Interaction</TITLE>
<FILE>x_interaction</FILE>
GDK_SURFACE_XID
GDK_DISPLAY_XDISPLAY

3
gdk/x11/gdkmain-x11.c
View File

@ -50,9 +50,10 @@
* SECTION:x_interaction
* @Short_description: X backend-specific functions
* @Title: X Window System Interaction
* @Include: gdk/x11/gdkx.h
*
* The functions in this section are specific to the GDK X11 backend.
* To use them, you need to include the `<gdk/gdkx.h>` header and use
* To use them, you need to include the `<gdk/x11/gdkx.h>` header and use
* the X11-specific pkg-config file `gtk4-x11` to build your application.
*
* To make your code compile with other GDK backends, guard backend-specific

2
gdk/x11/gdkx-autocleanups.h
View File

@ -16,7 +16,7 @@
*/
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#ifndef __GI_SCANNER__

2
gdk/x11/gdkx11applaunchcontext.h
View File

@ -19,7 +19,7 @@
#define __GDK_X11_APP_LAUNCH_CONTEXT_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11device.h
View File

@ -19,7 +19,7 @@
#define __GDK_X11_DEVICE_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11devicemanager.h
View File

@ -19,7 +19,7 @@
#define __GDK_X11_DEVICE_MANAGER_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11display.h
View File

@ -26,7 +26,7 @@
#define __GDK_X11_DISPLAY_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11dnd.h
View File

@ -19,7 +19,7 @@
#define __GDK_X11_DND_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11glcontext.h
View File

@ -22,7 +22,7 @@
#define __GDK_X11_GL_CONTEXT_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11keys.h
View File

@ -19,7 +19,7 @@
#define __GDK_X11_KEYS_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11monitor.h
View File

@ -23,7 +23,7 @@
#define __GDK_X11_MONITOR_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdkmonitor.h>

2
gdk/x11/gdkx11property.h
View File

@ -26,7 +26,7 @@
#define __GDK_X11_PROPERTY_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11screen.h
View File

@ -26,7 +26,7 @@
#define __GDK_X11_SCREEN_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11selection.h
View File

@ -26,7 +26,7 @@
#define __GDK_X11_SELECTION_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11surface.h
View File

@ -26,7 +26,7 @@
#define __GDK_X11_SURFACE_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>

2
gdk/x11/gdkx11utils.h
View File

@ -26,7 +26,7 @@
#define __GDK_X11_UTILS_H__
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#error "Only <gdk/x11/gdkx.h> can be included directly."
#endif
#include <gdk/gdk.h>