diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-08-04 22:35:16 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-08-04 22:35:16 +0000 |
| commit | b1e744b064bc88bda3651b03f90aff5184532b8e (patch) | |
| tree | ccd12c5689398051d556cfed1445723ba1aac2cf /gdk/win32 | |
| parent | ad2ea92f7519b9d4827c6bdb17f560566f778627 (diff) | |
| download | gtk+-b1e744b064bc88bda3651b03f90aff5184532b8e.tar.gz | |
Bug 544684 - Win64 issue, window handles are assumed to be 32-bit
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
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkdnd-win32.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index 8644701823..41773a68f1 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -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); |