diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-08-04 23:01:32 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-08-04 23:01:32 +0000 |
| commit | a860ec7d7b9b5410b41a67b6ebbb3e61a3a04d10 (patch) | |
| tree | 9bf9b016e640fffc3622ffaa89e1764b957ae46b /gdk | |
| parent | eff4be5c8de9642fdd39e667e53ccca58b9070ef (diff) | |
| download | gdk-pixbuf-a860ec7d7b9b5410b41a67b6ebbb3e61a3a04d10.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/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c: Add some guchar and char pointer
casts to get rid of gcc 4.4 warnings. Print GdkAtom values in
debugging output using the %p format.
svn path=/trunk/; revision=20993
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/win32/gdkproperty-win32.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index 0617e4c98..0215c47e3 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -171,10 +171,10 @@ gdk_property_change (GdkWindow *window, GDK_NOTE (DND, (prop_name = gdk_atom_name (property), type_name = gdk_atom_name (type), - g_print ("gdk_property_change: %p %#x (%s) %#x (%s) %s %d*%d bytes: %s\n", + g_print ("gdk_property_change: %p %p (%s) %p (%s) %s %d*%d bytes: %s\n", GDK_WINDOW_HWND (window), - (guint) property, prop_name, - (guint) type, type_name, + property, prop_name, + type, type_name, (mode == GDK_PROP_MODE_REPLACE ? "REPLACE" : (mode == GDK_PROP_MODE_PREPEND ? "PREPEND" : (mode == GDK_PROP_MODE_APPEND ? "APPEND" : @@ -202,7 +202,7 @@ gdk_property_change (GdkWindow *window, return; } - nchars = g_utf8_strlen (data, nelements); + nchars = g_utf8_strlen ((char*) data, nelements); /* Check if only ASCII */ for (i = 0; i < nelements; i++) @@ -225,7 +225,7 @@ gdk_property_change (GdkWindow *window, /* Use CF_UNICODETEXT */ method = UNICODE_TEXT; - wcptr = g_utf8_to_utf16 (data, nelements, NULL, &wclen, NULL); + wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, NULL); wclen++; /* Terminating 0 */ size = wclen * 2; @@ -320,9 +320,9 @@ gdk_property_delete (GdkWindow *window, GDK_NOTE (DND, (prop_name = gdk_atom_name (property), - g_print ("gdk_property_delete: %p %#x (%s)\n", + g_print ("gdk_property_delete: %p %p (%s)\n", GDK_WINDOW_HWND (window), - (guint) property, prop_name), + property, prop_name), g_free (prop_name))); if (property == _gdk_selection_property) |