From a74058a958e864aaa2f9f902ae5dbbf0d3d0cc25 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 9 Jul 2018 00:09:05 +0200 Subject: [PATCH] Fix wxGetKeyState() compilation with wxGTK 1 This was broken back in a73251a80d95efa37bf1fc7879b21a6aec57910d which added check for GDK_WINDOWING_X11 which is not defined by GTK+ 1. See #14469. --- src/unix/utilsx11.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp index d4f659df7c..97c8fa5560 100644 --- a/src/unix/utilsx11.cpp +++ b/src/unix/utilsx11.cpp @@ -50,8 +50,9 @@ GdkWindow* wxGetTopLevelGDK(); GtkWidget* wxGetTopLevelGTK(); #endif -// Only X11 backend is supported for wxGTK here -#if !defined(__WXGTK__) || defined(GDK_WINDOWING_X11) +// Only X11 backend is supported for wxGTK here (GTK < 2 has no others) +#if !defined(__WXGTK__) || \ + (!defined(__WXGTK20__) || defined(GDK_WINDOWING_X11)) // Various X11 Atoms used in this file: static Atom _NET_WM_STATE = 0;