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

Give an error when trying to use wxGLCanvas on non-X11 display

Browse Source 
Currently, wxGLCanvas on wxGTK is only supported on X11 displays.  If a
user attempts to use wxGLCanvas on Wayland, for example, the application
will core dump.  This change adds an error message and a suggested
workaround until wxGLCanvas is supported on Wayland.

See #17702.

Closes https://github.com/wxWidgets/wxWidgets/pull/871
This commit is contained in:
Scott Talbert
2018-07-31 23:00:49 -04:00
committed by Vadim Zeitlin
parent 148079c618
commit 95857a1f71
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/glcanvas.cpp
View File

@@ -222,6 +222,19 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
#endif // WXWIN_COMPATIBILITY_2_8 #endif // WXWIN_COMPATIBILITY_2_8
static bool IsAvailable()
{
#ifdef GDK_WINDOWING_X11
if ( !GDK_IS_X11_DISPLAY(gdk_display_get_default()) )
#endif
{
wxSafeShowMessage(_("Fatal Error"), _("wxGLCanvas is only supported on X11 currently. You may be able to\nwork around this by setting environment variable GDK_BACKEND=x11 before starting\nyour program."));
return false;
}
return true;
}
bool wxGLCanvas::Create(wxWindow *parent, bool wxGLCanvas::Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos, const wxPoint& pos,
@@ -231,6 +244,9 @@ bool wxGLCanvas::Create(wxWindow *parent,
const int *attribList, const int *attribList,
const wxPalette& palette) const wxPalette& palette)
{ {
if ( !IsAvailable() )
return false;
// Separate 'GLXFBConfig/XVisual' attributes. // Separate 'GLXFBConfig/XVisual' attributes.
// Also store context attributes for wxGLContext ctor // Also store context attributes for wxGLContext ctor
wxGLAttributes dispAttrs; wxGLAttributes dispAttrs;
@@ -249,6 +265,9 @@ bool wxGLCanvas::Create(wxWindow *parent,
const wxString& name, const wxString& name,
const wxPalette& palette) const wxPalette& palette)
{ {
if ( !IsAvailable() )
return false;
#if wxUSE_PALETTE #if wxUSE_PALETTE
wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") ); wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE