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/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
This commit is contained in:
Tor Lillqvist
2008-08-04 23:01:32 +00:00
committed by Tor Lillqvist
parent eff4be5c8d
commit a860ec7d7b
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -25,6 +25,7 @@
parameter of gdk_selection_send_notify_for_display() and parameter of gdk_selection_send_notify_for_display() and
gdk_selection_send_notify(). gdk_selection_send_notify().
* gdk/win32/gdkproperty-win32.c
* gdk/win32/gdkselection-win32.c: Add some guchar and char pointer * gdk/win32/gdkselection-win32.c: Add some guchar and char pointer
casts to get rid of gcc 4.4 warnings. Print GdkAtom values in casts to get rid of gcc 4.4 warnings. Print GdkAtom values in
debugging output using the %p format. debugging output using the %p format.

14
gdk/win32/gdkproperty-win32.c
View File

@ -171,10 +171,10 @@ gdk_property_change (GdkWindow *window,
GDK_NOTE (DND, GDK_NOTE (DND,
(prop_name = gdk_atom_name (property), (prop_name = gdk_atom_name (property),
type_name = gdk_atom_name (type), 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), GDK_WINDOW_HWND (window),
(guint) property, prop_name, property, prop_name,
(guint) type, type_name, type, type_name,
(mode == GDK_PROP_MODE_REPLACE ? "REPLACE" : (mode == GDK_PROP_MODE_REPLACE ? "REPLACE" :
(mode == GDK_PROP_MODE_PREPEND ? "PREPEND" : (mode == GDK_PROP_MODE_PREPEND ? "PREPEND" :
(mode == GDK_PROP_MODE_APPEND ? "APPEND" : (mode == GDK_PROP_MODE_APPEND ? "APPEND" :
@ -202,7 +202,7 @@ gdk_property_change (GdkWindow *window,
return; return;
} }
nchars = g_utf8_strlen (data, nelements); nchars = g_utf8_strlen ((char*) data, nelements);
/* Check if only ASCII */ /* Check if only ASCII */
for (i = 0; i < nelements; i++) for (i = 0; i < nelements; i++)
@ -225,7 +225,7 @@ gdk_property_change (GdkWindow *window,
/* Use CF_UNICODETEXT */ /* Use CF_UNICODETEXT */
method = UNICODE_TEXT; 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 */ wclen++; /* Terminating 0 */
size = wclen * 2; size = wclen * 2;
@ -320,9 +320,9 @@ gdk_property_delete (GdkWindow *window,
GDK_NOTE (DND, GDK_NOTE (DND,
(prop_name = gdk_atom_name (property), (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), GDK_WINDOW_HWND (window),
(guint) property, prop_name), property, prop_name),
g_free (prop_name))); g_free (prop_name)));
if (property == _gdk_selection_property) if (property == _gdk_selection_property)