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

Build fix for GDK_WINDOWING_WAYLAND not defined

Browse Source 
Add some missing GDK_WINDOWING_WAYLAND wrappers.
Also some minor changes to includes.
This commit is contained in:
Paul Cornett
2020-09-01 08:14:58 -07:00
parent 5dd3b733bd
commit 05a134d985
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/unix/glegl.cpp
View File

@@ -20,16 +20,15 @@
#if wxUSE_GLCANVAS && wxUSE_GLCANVAS_EGL #if wxUSE_GLCANVAS && wxUSE_GLCANVAS_EGL
#include "wx/glcanvas.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/log.h" #include "wx/log.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/glcanvas.h" #include "wx/gtk/private/wrapgtk.h"
#include <gtk/gtk.h>
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h> #include <gdk/gdkwayland.h>
#include <wayland-client.h>
#include <wayland-egl.h> #include <wayland-egl.h>
#endif #endif
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
@@ -392,6 +391,7 @@ EGLDisplay wxGLCanvasEGL::GetDisplay()
return eglGetPlatformDisplay(platform, info.dpy, NULL); return eglGetPlatformDisplay(platform, info.dpy, NULL);
} }
#ifdef GDK_WINDOWING_WAYLAND
extern "C" extern "C"
{ {
@@ -445,6 +445,7 @@ static void gtk_glcanvas_size_callback(GtkWidget *widget,
} }
} // extern "C" } // extern "C"
#endif // GDK_WINDOWING_WAYLAND
bool wxGLCanvasEGL::CreateSurface() bool wxGLCanvasEGL::CreateSurface()
{ {
@@ -519,10 +520,12 @@ wxGLCanvasEGL::~wxGLCanvasEGL()
delete m_config; delete m_config;
if ( m_surface ) if ( m_surface )
eglDestroySurface(m_display, m_surface); eglDestroySurface(m_display, m_surface);
#ifdef GDK_WINDOWING_WAYLAND
g_clear_pointer(&m_wlEGLWindow, wl_egl_window_destroy); g_clear_pointer(&m_wlEGLWindow, wl_egl_window_destroy);
g_clear_pointer(&m_wlSubsurface, wl_subsurface_destroy); g_clear_pointer(&m_wlSubsurface, wl_subsurface_destroy);
g_clear_pointer(&m_wlSurface, wl_surface_destroy); g_clear_pointer(&m_wlSurface, wl_surface_destroy);
g_clear_pointer(&m_wlFrameCallbackHandler, wl_callback_destroy); g_clear_pointer(&m_wlFrameCallbackHandler, wl_callback_destroy);
#endif
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------