Commit 3e332260 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Rename 'id' parameter to avoid problems with Objective C.

Wed Nov 28 18:37:04 2001  Owen Taylor  <otaylor@redhat.com>
	* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
	to avoid problems with Objective C.
parent a381648f
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607)
......
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607)
......
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607)
......
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607)
......
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607)
......
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607)
......
Wed Nov 28 18:37:04 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.[ch] (gtk_socket_add_id): Rename 'id' parameter
to avoid problems with Objective C.
2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607)
......
......@@ -232,7 +232,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
/**
* gtk_socket_add_id:
* @socket: a #GtkSocket
* @id: the XID of a client participating in the XEMBED protocol.
* @window_id: the XID of a client participating in the XEMBED protocol.
*
* Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket. The
* client may be in the same process or in a different process.
......@@ -248,7 +248,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
* before you can make this call.
**/
void
gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow id)
gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow window_id)
{
g_return_if_fail (GTK_IS_SOCKET (socket));
g_return_if_fail (GTK_WIDGET_ANCHORED (socket));
......@@ -256,7 +256,7 @@ gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow id)
if (!GTK_WIDGET_REALIZED (socket))
gtk_widget_realize (GTK_WIDGET (socket));
gtk_socket_add_window (socket, id, TRUE);
gtk_socket_add_window (socket, window_id, TRUE);
}
/**
......
......@@ -80,7 +80,7 @@ GtkWidget* gtk_socket_new (void);
GtkType gtk_socket_get_type (void) G_GNUC_CONST;
void gtk_socket_add_id (GtkSocket *socket,
GdkNativeWindow id);
GdkNativeWindow window_id);
GdkNativeWindow gtk_socket_get_id (GtkSocket *socket);
#ifndef GTK_DISABLE_DEPRECATED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment