Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ad wxHAS_X11_SUPPORT helper to simplify the code

Browse Source 
This is much more readable than the existing (and now duplicated)
__WXGTK__ || !__WXGTK20__ || GDK_WINDOWING_X11 check.

No real changes.
This commit is contained in:
Vadim Zeitlin
2021-02-28 23:55:43 +01:00
parent 810b342411
commit f11db09e9b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/unix/utilsx11.cpp
View File

@@ -45,6 +45,7 @@
#endif #endif
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#define wxHAS_X11_SUPPORT
#endif #endif
GdkWindow* wxGetTopLevelGDK(); GdkWindow* wxGetTopLevelGDK();
GtkWidget* wxGetTopLevelGTK(); GtkWidget* wxGetTopLevelGTK();
@@ -52,11 +53,12 @@ GtkWidget* wxGetTopLevelGTK();
#if GTK_CHECK_VERSION(3,4,0) #if GTK_CHECK_VERSION(3,4,0)
#define wxHAS_GETKEYSTATE_GTK #define wxHAS_GETKEYSTATE_GTK
#endif //GTK+ 3.4 #endif //GTK+ 3.4
#else
// When not using GTK we always use X11, as we don't support anything else.
#define wxHAS_X11_SUPPORT
#endif // GTK #endif // GTK
// Only X11 backend is supported for wxGTK here (GTK < 2 has no others) #ifdef wxHAS_X11_SUPPORT
#if !defined(__WXGTK__) || \
(!defined(__WXGTK20__) || defined(GDK_WINDOWING_X11))
// Various X11 Atoms used in this file: // Various X11 Atoms used in this file:
static Atom _NET_WM_STATE = 0; static Atom _NET_WM_STATE = 0;
@@ -2593,7 +2595,7 @@ static bool wxGetKeyStateX11(wxKeyCode key)
return (key_vector[keyCode >> 3] & (1 << (keyCode & 7))) != 0; return (key_vector[keyCode >> 3] & (1 << (keyCode & 7))) != 0;
} }
#endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11) #endif // wxHAS_X11_SUPPORT
// We need to use GDK functions when using wxGTK with a non-X11 backend, the // We need to use GDK functions when using wxGTK with a non-X11 backend, the
// X11 code above can't work in this case. // X11 code above can't work in this case.
@@ -2647,8 +2649,7 @@ bool wxGetKeyState(wxKeyCode key)
} }
#endif // GTK+ 3.4+ #endif // GTK+ 3.4+
#if !defined(__WXGTK__) || \ #ifdef wxHAS_X11_SUPPORT
(!defined(__WXGTK20__) || defined(GDK_WINDOWING_X11))
return wxGetKeyStateX11(key); return wxGetKeyStateX11(key);
#endif #endif