Fix compilation against latest GTK+-3 changes
GDK_WINDOW_XWINDOW has been removed. All calls should use gdk_x11_window_get_xid() instead.
This commit is contained in:
parent
0c8941715d
commit
7ce65e421b
@ -106,7 +106,7 @@ shell_embedded_window_realize (GtkWidget *widget)
|
||||
* modifying the GDK hierarchy.
|
||||
*/
|
||||
XReparentWindow (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)),
|
||||
GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
|
||||
gdk_x11_window_get_xid (gtk_widget_get_window (widget)),
|
||||
window->priv->stage_xwindow,
|
||||
window->priv->position.x, window->priv->position.y);
|
||||
}
|
||||
|
@ -39,7 +39,7 @@ shell_gtk_embed_on_window_realize (GtkWidget *widget,
|
||||
* screen.
|
||||
*/
|
||||
clutter_x11_texture_pixmap_set_window (CLUTTER_X11_TEXTURE_PIXMAP (embed),
|
||||
GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
|
||||
gdk_x11_window_get_xid (gtk_widget_get_window (widget)),
|
||||
FALSE);
|
||||
}
|
||||
|
||||
|
@ -420,7 +420,7 @@ na_tray_child_force_redraw (NaTrayChild *child)
|
||||
gtk_widget_get_allocation (widget, &allocation);
|
||||
|
||||
xev.xexpose.type = Expose;
|
||||
xev.xexpose.window = GDK_WINDOW_XWINDOW (plug_window);
|
||||
xev.xexpose.window = gdk_x11_window_get_xid (plug_window);
|
||||
xev.xexpose.x = 0;
|
||||
xev.xexpose.y = 0;
|
||||
xev.xexpose.width = allocation.width;
|
||||
|
@ -601,7 +601,7 @@ na_tray_manager_set_orientation_property (NaTrayManager *manager)
|
||||
SYSTEM_TRAY_ORIENTATION_VERT;
|
||||
|
||||
XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
|
||||
GDK_WINDOW_XWINDOW (window),
|
||||
gdk_x11_window_get_xid (window),
|
||||
orientation_atom,
|
||||
XA_CARDINAL, 32,
|
||||
PropModeReplace,
|
||||
@ -646,7 +646,7 @@ na_tray_manager_set_visual_property (NaTrayManager *manager)
|
||||
data[0] = XVisualIDFromVisual (xvisual);
|
||||
|
||||
XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
|
||||
GDK_WINDOW_XWINDOW (window),
|
||||
gdk_x11_window_get_xid (window),
|
||||
visual_atom,
|
||||
XA_VISUALID, 32,
|
||||
PropModeReplace,
|
||||
@ -724,7 +724,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
|
||||
xev.data.l[0] = timestamp;
|
||||
xev.data.l[1] = gdk_x11_atom_to_xatom_for_display (display,
|
||||
manager->selection_atom);
|
||||
xev.data.l[2] = GDK_WINDOW_XWINDOW (window);
|
||||
xev.data.l[2] = gdk_x11_window_get_xid (window);
|
||||
xev.data.l[3] = 0; /* manager specific data */
|
||||
xev.data.l[4] = 0; /* manager specific data */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user