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

avoid gtk_widget_get_root_window(), deprecated in GTK+ 3.12

Browse Source 
(cherry picked from commit a15e776dcd)
This commit is contained in:
Paul Cornett
2015-10-10 11:50:27 -07:00
parent 61460acef7
commit def0cd59ea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/toplevel.cpp
View File

@@ -857,7 +857,8 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
m_fsIsShowing = show; m_fsIsShowing = show;
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
GdkDisplay *display = gtk_widget_get_display(m_widget); GdkScreen* screen = gtk_widget_get_screen(m_widget);
GdkDisplay* display = gdk_screen_get_display(screen);
Display* xdpy = NULL; Display* xdpy = NULL;
Window xroot = None; Window xroot = None;
wxX11FullScreenMethod method = wxX11_FS_WMSPEC; wxX11FullScreenMethod method = wxX11_FS_WMSPEC;
@@ -865,7 +866,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
if (GDK_IS_X11_DISPLAY(display)) if (GDK_IS_X11_DISPLAY(display))
{ {
xdpy = GDK_DISPLAY_XDISPLAY(display); xdpy = GDK_DISPLAY_XDISPLAY(display);
xroot = GDK_WINDOW_XID(gtk_widget_get_root_window(m_widget)); xroot = GDK_WINDOW_XID(gdk_screen_get_root_window(screen));
method = wxGetFullScreenMethodX11(xdpy, (WXWindow)xroot); method = wxGetFullScreenMethodX11(xdpy, (WXWindow)xroot);
} }
@@ -892,7 +893,6 @@ 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 );
GdkScreen* screen = gtk_widget_get_screen(m_widget);
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);