Only include X11 headers when we actually need X11 support

These headers may not be available at all when building wxGTK with
Wayland-only GTK version.
This commit is contained in:
Vadim Zeitlin
2021-03-01 13:06:17 +01:00
parent fa3cf06273
commit a8e918727a

View File

@@ -13,8 +13,6 @@
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/unix/utilsx11.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
@@ -26,16 +24,6 @@
#include "wx/apptrait.h"
#include "wx/private/launchbrowser.h"
#ifdef __VMS
#pragma message disable nosimpint
#endif
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
#ifdef __VMS
#pragma message enable nosimpint
#endif
#ifdef __WXGTK__
#ifdef __WXGTK20__
#include "wx/gtk/private/wrapgtk.h"
@@ -60,6 +48,17 @@ GtkWidget* wxGetTopLevelGTK();
#ifdef wxHAS_X11_SUPPORT
#include "wx/unix/utilsx11.h"
#ifdef __VMS
#pragma message disable nosimpint
#endif
#include <X11/Xatom.h>
#include <X11/Xutil.h>
#ifdef __VMS
#pragma message enable nosimpint
#endif
// Various X11 Atoms used in this file:
static Atom _NET_WM_STATE = 0;
static Atom _NET_WM_STATE_FULLSCREEN = 0;