From 3c2f575f8ea4ce38a1c760db7fc9f7d0c3842a45 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 17 Dec 2017 21:51:49 -0800 Subject: [PATCH] Avoid old X11 fullscreen code with GTK+4 --- src/gtk/toplevel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 37d15df568..f300b5ea56 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -852,7 +852,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) m_fsIsShowing = show; -#ifdef GDK_WINDOWING_X11 +#if defined(GDK_WINDOWING_X11) && !defined(__WXGTK4__) GdkScreen* screen = gtk_widget_get_screen(m_widget); GdkDisplay* display = gdk_screen_get_display(screen); Display* xdpy = NULL; @@ -878,7 +878,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) else gtk_window_unfullscreen( GTK_WINDOW( m_widget ) ); } -#ifdef GDK_WINDOWING_X11 +#if defined(GDK_WINDOWING_X11) && !defined(__WXGTK4__) else if (xdpy != NULL) { GdkWindow* window = gtk_widget_get_window(m_widget); @@ -889,8 +889,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y ); GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height ); + wxGCC_WARNING_SUPPRESS(deprecated-declarations) const int screen_width = gdk_screen_get_width(screen); const int screen_height = gdk_screen_get_height(screen); + wxGCC_WARNING_RESTORE() gint client_x, client_y, root_x, root_y; gint width, height;