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

Avoid old X11 fullscreen code with GTK+4

Browse Source
This commit is contained in:
Paul Cornett
2017-12-17 21:51:49 -08:00
parent b2ea617145
commit 3c2f575f8e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/toplevel.cpp
View File

@@ -852,7 +852,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
m_fsIsShowing = show; m_fsIsShowing = show;
#ifdef GDK_WINDOWING_X11 #if defined(GDK_WINDOWING_X11) && !defined(__WXGTK4__)
GdkScreen* screen = gtk_widget_get_screen(m_widget); GdkScreen* screen = gtk_widget_get_screen(m_widget);
GdkDisplay* display = gdk_screen_get_display(screen); GdkDisplay* display = gdk_screen_get_display(screen);
Display* xdpy = NULL; Display* xdpy = NULL;
@@ -878,7 +878,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
else else
gtk_window_unfullscreen( GTK_WINDOW( m_widget ) ); gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
} }
#ifdef GDK_WINDOWING_X11 #if defined(GDK_WINDOWING_X11) && !defined(__WXGTK4__)
else if (xdpy != NULL) else if (xdpy != NULL)
{ {
GdkWindow* window = gtk_widget_get_window(m_widget); 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 ); GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height ); GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
const int screen_width = gdk_screen_get_width(screen); const int screen_width = gdk_screen_get_width(screen);
const int screen_height = gdk_screen_get_height(screen); const int screen_height = gdk_screen_get_height(screen);
wxGCC_WARNING_RESTORE()
gint client_x, client_y, root_x, root_y; gint client_x, client_y, root_x, root_y;
gint width, height; gint width, height;