Change the window parameter for

Tue Sep 24 05:26:31 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/gdk.h gdk/gdkdisplay.c gdk/linux-fb/gdkevents-fb.c
        gdk/x11/gdkevents-x11.c  gdk/win32/gdkevents-win32.c:
        Change the window parameter for
        gdk_event_send_client_message[_for_display] from guint32
        to GdkNativeWindow. (#79979)

11 files changed, 68 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 266edc5390..f085a13ef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep 24 05:26:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdk.h gdk/gdkdisplay.c gdk/linux-fb/gdkevents-fb.c 
+	gdk/x11/gdkevents-x11.c  gdk/win32/gdkevents-win32.c:
+	Change the window parameter for 
+	gdk_event_send_client_message[_for_display] from guint32
+	to GdkNativeWindow. (#79979)
+
 Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk+.spec.in: Fix up a bit to look for the loaders
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 266edc5390..f085a13ef4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Sep 24 05:26:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdk.h gdk/gdkdisplay.c gdk/linux-fb/gdkevents-fb.c 
+	gdk/x11/gdkevents-x11.c  gdk/win32/gdkevents-win32.c:
+	Change the window parameter for 
+	gdk_event_send_client_message[_for_display] from guint32
+	to GdkNativeWindow. (#79979)
+
 Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk+.spec.in: Fix up a bit to look for the loaders
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 266edc5390..f085a13ef4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue Sep 24 05:26:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdk.h gdk/gdkdisplay.c gdk/linux-fb/gdkevents-fb.c 
+	gdk/x11/gdkevents-x11.c  gdk/win32/gdkevents-win32.c:
+	Change the window parameter for 
+	gdk_event_send_client_message[_for_display] from guint32
+	to GdkNativeWindow. (#79979)
+
 Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk+.spec.in: Fix up a bit to look for the loaders
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 266edc5390..f085a13ef4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Sep 24 05:26:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdk.h gdk/gdkdisplay.c gdk/linux-fb/gdkevents-fb.c 
+	gdk/x11/gdkevents-x11.c  gdk/win32/gdkevents-win32.c:
+	Change the window parameter for 
+	gdk_event_send_client_message[_for_display] from guint32
+	to GdkNativeWindow. (#79979)
+
 Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk+.spec.in: Fix up a bit to look for the loaders
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 266edc5390..f085a13ef4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Sep 24 05:26:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdk.h gdk/gdkdisplay.c gdk/linux-fb/gdkevents-fb.c 
+	gdk/x11/gdkevents-x11.c  gdk/win32/gdkevents-win32.c:
+	Change the window parameter for 
+	gdk_event_send_client_message[_for_display] from guint32
+	to GdkNativeWindow. (#79979)
+
 Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk+.spec.in: Fix up a bit to look for the loaders
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 266edc5390..f085a13ef4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Sep 24 05:26:31 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/gdk.h gdk/gdkdisplay.c gdk/linux-fb/gdkevents-fb.c 
+	gdk/x11/gdkevents-x11.c  gdk/win32/gdkevents-win32.c:
+	Change the window parameter for 
+	gdk_event_send_client_message[_for_display] from guint32
+	to GdkNativeWindow. (#79979)
+
 Tue Sep 24 05:16:25 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk+.spec.in: Fix up a bit to look for the loaders
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 1773398119..44b7391e93 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -153,13 +153,13 @@ gint       gdk_mbstowcs          (GdkWChar         *dest,
 
 /* Miscellaneous */
 #ifndef GDK_MULTIHEAD_SAFE
-gboolean gdk_event_send_client_message      (GdkEvent  *event,
-					     guint32    xid);
+gboolean gdk_event_send_client_message      (GdkEvent       *event,
+					     GdkNativeWindow winid);
 void     gdk_event_send_clientmessage_toall (GdkEvent  *event);
 #endif
 gboolean gdk_event_send_client_message_for_display (GdkDisplay *display,
-						    GdkEvent   *event,
-						    guint32	xid);
+						    GdkEvent       *event,
+						    GdkNativeWindow winid);
 /* Threading
  */
 
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index dfaae31ad7..4277d9d829 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -270,7 +270,7 @@ gdk_beep (void)
 /**
  * gdk_event_send_client_message:
  * @event: the #GdkEvent to send, which should be a #GdkEventClient.
- * @xid:  the window to send the X ClientMessage event to.
+ * @winid:  the window to send the X ClientMessage event to.
  * 
  * Sends an X ClientMessage event to a given window (which must be
  * on the default #GdkDisplay.)
@@ -280,12 +280,13 @@ gdk_beep (void)
  * Return value: non-zero on success.
  **/
 gboolean
-gdk_event_send_client_message (GdkEvent *event, guint32 xid)
+gdk_event_send_client_message (GdkEvent        *event,
+			       GdkNativeWindow  winid)
 {
   g_return_val_if_fail (event != NULL, FALSE);
 
   return gdk_event_send_client_message_for_display (gdk_display_get_default (),
-						    event, xid);
+						    event, winid);
 }
 
 /**
diff --git a/gdk/linux-fb/gdkevents-fb.c b/gdk/linux-fb/gdkevents-fb.c
index a067b79496..b61377e4db 100644
--- a/gdk/linux-fb/gdkevents-fb.c
+++ b/gdk/linux-fb/gdkevents-fb.c
@@ -200,9 +200,9 @@ gdk_flush (void)
 }
 
 gboolean
-gdk_event_send_client_message_for_display (GdkDisplay *display,
-					   GdkEvent   *event,
-					   guint32     xid)
+gdk_event_send_client_message_for_display (GdkDisplay      *display,
+					   GdkEvent        *event,
+					   GdkNativeWindow  winid)
 {
   return FALSE;
 }
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index eac4b8cb2f..327577364c 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -3519,9 +3519,9 @@ gdk_event_dispatch (GSource     *source,
 
 /* Sends a ClientMessage to all toplevel client windows */
 gboolean
-gdk_event_send_client_message_for_display (GdkDisplay *display,
-                                           GdkEvent   *event, 
-                                           guint32     xid)
+gdk_event_send_client_message_for_display (GdkDisplay     *display,
+                                           GdkEvent       *event, 
+                                           GdkNativeWindow winid)
 {
   /* XXX */
   return FALSE;
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 6bd38ebaa2..497570c9f2 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1837,7 +1837,7 @@ gdk_event_dispatch (GSource    *source,
  * gdk_event_send_client_message_for_display :
  * @display : the #GdkDisplay for the window where the message is to be sent.
  * @event : the #GdkEvent to send, which should be a #GdkEventClient.
- * @xid : the X window to send the X ClientMessage event to.
+ * @winid : the window to send the X ClientMessage event to.
  *
  * Sends an X ClientMessage event to a given window.
  *
@@ -1847,9 +1847,9 @@ gdk_event_dispatch (GSource    *source,
  * Returns : non-zero on success.
  */
 gboolean
-gdk_event_send_client_message_for_display (GdkDisplay *display,
-					   GdkEvent *event,
-					   guint32 xid)
+gdk_event_send_client_message_for_display (GdkDisplay     *display,
+					   GdkEvent       *event,
+					   GdkNativeWindow winid)
 {
   XEvent sev;
   
@@ -1859,11 +1859,11 @@ gdk_event_send_client_message_for_display (GdkDisplay *display,
   sev.xclient.type = ClientMessage;
   sev.xclient.display = GDK_DISPLAY_XDISPLAY (display);
   sev.xclient.format = event->client.data_format;
-  sev.xclient.window = xid;
+  sev.xclient.window = winid;
   memcpy(&sev.xclient.data, &event->client.data, sizeof (sev.xclient.data));
   sev.xclient.message_type = gdk_x11_atom_to_xatom_for_display (display, event->client.message_type);
   
-  return _gdk_send_xevent (display, xid, False, NoEventMask, &sev);
+  return _gdk_send_xevent (display, winid, False, NoEventMask, &sev);
 }