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

diff --git a/ChangeLog b/ChangeLog
index 47b90abbece424e595da6558d054436a42533de2..c4291f8cfd95fc6944361bef76d9935c467e36ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
        parameter of gdk_selection_send_notify_for_display() and
        gdk_selection_send_notify().
 
+       * 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.

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 0617e4c985eb2f5c0f977f2f5f675a7eea3f474e..0215c47e3d472421a9954b725e8f59b2fe87559b 100644 (file)
--- 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)