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

Avoid crashing when wxTaskBarIcon is used with a non-X11 display

Browse Source 
Fixes #17779
This commit is contained in:
Scott Talbert
2017-11-13 21:43:24 -05:00
committed by paulcor
parent 5463402e39
commit 0d62f728ae
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/taskbar.cpp
View File

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