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

Bug 544684 - Win64 issue, window handles are assumed to be 32-bit

Browse Source 
2008-08-05  Tor Lillqvist  <tml@novell.com>

	Bug 544684 - Win64 issue, window handles are assumed to be 32-bit

	* gdk/gdkdnd.h
	* gdk/gdkdnd.c
	* gdk/win32/gdkdnd-win32.c
	* gdk/x11/gdkdnd-x11.c: Change return value and type of window id
	from guint32 to GdkNativeWindow for
	gdk_drag_get_protocol_for_display() and
	gdk_drag_get_protocol(). This is not an API break on existing
	platforms, as GdkNativeWindow has been guint32 for them
	already.


svn path=/trunk/; revision=20988
This commit is contained in:
Tor Lillqvist
2008-08-04 22:35:16 +00:00
committed by Tor Lillqvist
parent ad2ea92f75
commit b1e744b064
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/win32/gdkdnd-win32.c
View File

@ -854,7 +854,7 @@ enum_formats_new (void)
static gboolean
resolve_link (HWND hWnd,
wchar_t *link,
guchar **lpszPath)
gchar **lpszPath)
{
WIN32_FILE_ATTRIBUTE_DATA wfad;
HRESULT hres;
@ -938,7 +938,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
HANDLE hdrop;
POINT pt;
gint nfiles, i;
guchar *fileName, *linkedFile;
gchar *fileName, *linkedFile;
if (msg->message == WM_DROPFILES)
{
@ -1294,9 +1294,9 @@ gdk_drag_begin (GdkWindow *window,
#endif
}
guint32
GdkNativeWindow
gdk_drag_get_protocol_for_display (GdkDisplay *display,
guint32 xid,
GdkNativeWindow xid,
GdkDragProtocol *protocol)
{
GdkWindow *window;
@ -1373,7 +1373,7 @@ gdk_drag_find_window_for_screen (GdkDragContext *context,
*dest_window = NULL;
else
{
*dest_window = gdk_win32_handle_table_lookup (GPOINTER_TO_UINT (a.result));
*dest_window = gdk_win32_handle_table_lookup (a.result);
if (*dest_window)
{
*dest_window = gdk_window_get_toplevel (*dest_window);