callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make gdk_window_{lookup,foreign_new}_for_display backend specific

Browse Source 
At the same time, make GDK_IS_DISPLAY_X11 available in gdkx.h, and
add some exemplaric ifdefs to GTK+ code.
This commit is contained in:
Matthias Clasen
2010-12-15 01:39:30 -05:00
parent 39a71b8831
commit 2d7583c0e3
23 changed files with 185 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/x11/gdkscreen-x11.c
View File

@ -1023,8 +1023,8 @@ gdk_screen_x11_get_active_window (GdkScreen *screen)
if (window != None)
{
ret = gdk_window_foreign_new_for_display (screen_x11->display,
*(GdkNativeWindow *) data);
ret = gdk_x11_window_foreign_new_for_display (screen_x11->display,
*(Window *) data);
}
}
}
@ -1071,8 +1071,8 @@ gdk_screen_x11_get_window_stack (GdkScreen *screen)
for (i = 0; i < nitems_return; i++)
{
win = gdk_window_foreign_new_for_display (screen_x11->display,
(GdkNativeWindow)stack[i]);
win = gdk_x11_window_foreign_new_for_display (screen_x11->display,
(Window)stack[i]);
if (win != NULL)
ret = g_list_append (ret, win);
@ -1507,7 +1507,7 @@ gdk_xsettings_watch_cb (Window window,
GdkWindow *gdkwin;
GdkScreen *screen = cb_data;
gdkwin = gdk_window_lookup_for_display (gdk_screen_get_display (screen), window);
gdkwin = gdk_x11_window_lookup_for_display (gdk_screen_get_display (screen), window);
if (is_start)
{
@ -1515,7 +1515,7 @@ gdk_xsettings_watch_cb (Window window,
g_object_ref (gdkwin);
else
{
gdkwin = gdk_window_foreign_new_for_display (gdk_screen_get_display (screen), window);
gdkwin = gdk_x11_window_foreign_new_for_display (gdk_screen_get_display (screen), window);
/* gdk_window_foreign_new_for_display() can fail and return NULL if the
* window has already been destroyed.