From: Olly Betts <olly@survex.com>
Date: Fri, 24 Feb 2023 00:23:10 +0000 (-0500)
Subject: Force X11 if wx GL library is loaded
X-Git-Tag: archive/raspbian/3.2.11+dfsg1-1+rpi1~1^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a4abdee49294678574b65a4e7011913b5e7de6a2;p=wxwidgets3.2.git

Force X11 if wx GL library is loaded

Bug: https://trac.wxwidgets.org/ticket/17702
Bug-Debian: https://bugs.debian.org/900678
Forwarded: no
Last-Update: 2022-11-28


Gbp-Pq: Name force-x11-for-wxgl.patch
---

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 07de770..2462302 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -24,6 +24,17 @@
 #include <gdk/gdkx.h>
 #endif
 
+#if GTK_CHECK_VERSION(3,10,0)
+// wxGTK's wxGLCanvas requires X11 currently, so tell GDK that so under
+// Wayland the app is still run using X11.  We put this here so it's
+// only run when the wx GL library is loaded (in a monolithic build this
+// will always be active if wx's GL support is enabled).
+struct ForceX11 {
+    ForceX11() { gdk_set_allowed_backends("x11"); }
+};
+static ForceX11 forcex11;
+#endif
+
 #ifdef __WXGTK3__
 extern "C" {
 static gboolean draw(GtkWidget* widget, cairo_t* cr, wxGLCanvas* win)