AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Use Window isntead of GdkNativeWindow

Browse Source
This commit is contained in:
Benjamin Otte 2011-02-01 18:29:20 +01:00
parent 44c02fcbb1
commit 7b5ad65e71
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/x11/gdkdnd-x11.c
View File

@ -3193,15 +3193,15 @@ _gdk_x11_window_drag_begin (GdkWindow *window,
return context;
}
GdkNativeWindow
Window
_gdk_x11_display_get_drag_protocol (GdkDisplay *display,
GdkNativeWindow xid,
Window xid,
GdkDragProtocol *protocol,
guint *version)
{
GdkWindow *window;
GdkNativeWindow retval;
Window retval;
base_precache_atoms (display);
@ -3214,10 +3214,10 @@ _gdk_x11_display_get_drag_protocol (GdkDisplay *display,
*protocol = GDK_DRAG_PROTO_XDND;
*version = 5;
xdnd_precache_atoms (display);
GDK_NOTE (DND, g_message ("Entering local Xdnd window %#x\n", xid));
GDK_NOTE (DND, g_message ("Entering local Xdnd window %#x\n", (guint) xid));
return xid;
}
else if (_gdk_x11_display_is_root_window (display, (Window) xid))
else if (_gdk_x11_display_is_root_window (display, xid))
{
*protocol = GDK_DRAG_PROTO_ROOTWIN;
GDK_NOTE (DND, g_message ("Entering root window\n"));
@ -3228,13 +3228,13 @@ _gdk_x11_display_get_drag_protocol (GdkDisplay *display,
{
*protocol = GDK_DRAG_PROTO_XDND;
xdnd_precache_atoms (display);
GDK_NOTE (DND, g_message ("Entering Xdnd window %#x\n", xid));
GDK_NOTE (DND, g_message ("Entering Xdnd window %#x\n", (guint) xid));
return retval;
}
else if ((retval = motif_check_dest (display, xid)))
{
*protocol = GDK_DRAG_PROTO_MOTIF;
GDK_NOTE (DND, g_message ("Entering motif window %#x\n", xid));
GDK_NOTE (DND, g_message ("Entering motif window %#x\n", (guint) xid));
return retval;
}
else

8
gdk/x11/gdkprivate-x11.h
View File

@ -183,10 +183,10 @@ void _gdk_x11_display_queue_events (GdkDisplay *display);
GdkAppLaunchContext *_gdk_x11_display_get_app_launch_context (GdkDisplay *display);
GdkNativeWindow _gdk_x11_display_get_drag_protocol (GdkDisplay *display,
GdkNativeWindow xid,
GdkDragProtocol *protocol,
guint *version);
Window _gdk_x11_display_get_drag_protocol (GdkDisplay *display,
Window xid,
GdkDragProtocol *protocol,
guint *version);
gboolean _gdk_x11_display_set_selection_owner (GdkDisplay *display,
GdkWindow *owner,