From 0d62f728aece1a66570b971539fa4911d2cfe179 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Mon, 13 Nov 2017 21:43:24 -0500
Subject: [PATCH] Avoid crashing when wxTaskBarIcon is used with a non-X11
 display

Fixes #17779
---
 src/gtk/taskbar.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 0f1202f68e..1cfb5f8816 100644
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -28,6 +28,7 @@
 #ifndef __WXGTK3__
     #include "eggtrayicon.h"
 #endif
+#include "wx/gtk/private/gtk2-compat.h"
 
 #if !GTK_CHECK_VERSION(2,10,0)
     typedef struct _GtkStatusIcon GtkStatusIcon;
@@ -127,6 +128,9 @@ status_icon_popup_menu(GtkStatusIcon*, guint, guint, wxTaskBarIcon* taskBarIcon)
 bool wxTaskBarIconBase::IsAvailable()
 {
 #ifdef GDK_WINDOWING_X11
+    if (!GDK_IS_X11_DISPLAY(gdk_display_get_default()))
+        return false;
+
     char name[32];
     g_snprintf(name, sizeof(name), "_NET_SYSTEM_TRAY_S%d",
         gdk_x11_get_default_screen());