diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-18 19:20:46 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2018-03-18 19:20:46 +0100 |
| commit | abc9b944f9153b5e770f0127589744c8b3f629c0 (patch) | |
| tree | dea1821d8825f9c9adc590e5320f9aa476c36db1 /testsuite | |
| parent | 87fa7ff314f87af924e0ba2317281adb2b4f62f8 (diff) | |
| download | gtk+-abc9b944f9153b5e770f0127589744c8b3f629c0.tar.gz | |
testsuite: Update C++ keywords test to GTK 3.0.0
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/gtk/autotestkeywords.cc | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/testsuite/gtk/autotestkeywords.cc b/testsuite/gtk/autotestkeywords.cc index 28b1d24bac..04c637ea1e 100644 --- a/testsuite/gtk/autotestkeywords.cc +++ b/testsuite/gtk/autotestkeywords.cc @@ -1,39 +1,27 @@ #include <gtk/gtk.h> -#ifdef GDK_WINDOWING_DIRECTFB -#define gdk_display gdk_display_directfb -#include <gdk/directfb/gdkdirectfb.h> -#undef gdk_display -#undef GDK_DISPLAY -#undef GDK_ROOT_WINDOW +#ifdef GDK_WINDOWING_BROADWAY +#include <gdk/broadway/gdkbroadway.h> #endif #ifdef GDK_WINDOWING_QUARTZ #if HAVE_OBJC -#define gdk_display gdk_display_quartz #include <gdk/quartz/gdkquartz.h> -#undef gdk_display -#undef GDK_DISPLAY -#undef GDK_ROOT_WINDOW #endif #endif +#ifdef GDK_WINDOWING_WAYLAND +#include <gdk/wayland/gdkwayland.h> +#endif + #ifndef __OBJC__ #ifdef GDK_WINDOWING_WIN32 -#define gdk_display gdk_display_win32 #include <gdk/win32/gdkwin32.h> -#undef gdk_display -#undef GDK_DISPLAY -#undef GDK_ROOT_WINDOW #endif #endif #ifdef GDK_WINDOWING_X11 -#define gdk_display gdk_display_x11 #include <gdk/x11/gdkx.h> -#undef gdk_display -#undef GDK_DISPLAY -#undef GDK_ROOT_WINDOW #endif int main() { return 0; } |