gtk+ r20993 - in trunk: . gdk/win32

[tml svn gnome org]

Author: tml
Date: Mon Aug  4 23:01:32 2008
New Revision: 20993
URL: http://svn.gnome.org/viewvc/gtk+?rev=20993&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gdk/win32/gdkproperty-win32.c

Modified: trunk/gdk/win32/gdkproperty-win32.c
==============================================================================
--- trunk/gdk/win32/gdkproperty-win32.c	(original)
+++ trunk/gdk/win32/gdkproperty-win32.c	Mon Aug  4 23:01:32 2008
@@ -171,10 +171,10 @@
   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 @@
 	      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 @@
 	      /* 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_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)