Merge pull request #2638 from swt2c/isdisplayavailable_wayland

Update wxApp.IsDisplayAvailable to work on Wayland
wxWidgets · Nov 8, 2024 · 45871c2 · 45871c2
2 parents 41823e3 + 57fd215
commit 45871c2
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/app_ex.cpp b/src/app_ex.cpp
@@ -1,6 +1,5 @@
 
 #ifdef __WXGTK__
-#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #endif
 
@@ -299,11 +298,11 @@ int wxPyApp::MainLoop()
 bool wxPyApp::IsDisplayAvailable()
 {
 #ifdef __WXGTK__
-    Display* display;
-    display = XOpenDisplay(NULL);
+    GdkDisplay* display;
+    display = gdk_display_open(NULL);
     if (display == NULL)
         return false;
-    XCloseDisplay(display);
+    gdk_display_close(display);
     return true;
 #endif