diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-09-10 11:26:16 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-09-10 22:33:58 -0400 |
| commit | a3c3031a0e1b7a6adece0d859f1f682ba7642672 (patch) | |
| tree | 4ee54baab17e6fe2a1e87ff0f1e7c3f98f8544d9 /gdk/x11/gdkx.h | |
| parent | ee14cc3160a1cfa4ac9dd2ee8b34291938d7e454 (diff) | |
| download | gtk+-a3c3031a0e1b7a6adece0d859f1f682ba7642672.tar.gz | |
Deprecate gdk_display and GDK_DISPLAY
Diffstat (limited to 'gdk/x11/gdkx.h')
| -rw-r--r-- | gdk/x11/gdkx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 9bc577ae00..836889089e 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS -#ifndef GDK_MULTIHEAD_SAFE +#if !defined (GDK_DISABLE_DEPRECATED) && !defined (GDK_MULTIHEAD_SAFE) && defined (GDK_COMPILATION) extern Display *gdk_display; #endif @@ -75,7 +75,7 @@ gint gdk_x11_get_default_screen (void); #define GDK_IMAGE_XDISPLAY(image) (gdk_x11_image_get_xdisplay (image)) #define GDK_IMAGE_XIMAGE(image) (gdk_x11_image_get_ximage (image)) -#ifndef GDK_MULTIHEAD_SAFE +#if !defined (GDK_DISABLE_DEPRECATED) && !defined (GDK_MULTIHEAD_SAFE) && defined (GDK_COMPILATION) #define GDK_DISPLAY() gdk_display #endif |