AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Owen Taylor 2001-11-28 23:54:30 +00:00 committed by Owen Taylor
parent a381648faa
commit 3e3322608c
9 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> 2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607) * gtk/gtkaccelmap.c: Typo fixes. (#65607)

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
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> 2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607) * gtk/gtkaccelmap.c: Typo fixes. (#65607)

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
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> 2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607) * gtk/gtkaccelmap.c: Typo fixes. (#65607)

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
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> 2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607) * gtk/gtkaccelmap.c: Typo fixes. (#65607)

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
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> 2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607) * gtk/gtkaccelmap.c: Typo fixes. (#65607)

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
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> 2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607) * gtk/gtkaccelmap.c: Typo fixes. (#65607)

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
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> 2001-11-28 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkaccelmap.c: Typo fixes. (#65607) * gtk/gtkaccelmap.c: Typo fixes. (#65607)

6
gtk/gtksocket.c
View File

@ -232,7 +232,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
/** /**
* gtk_socket_add_id: * gtk_socket_add_id:
* @socket: a #GtkSocket * @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 * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket. The
* client may be in the same process or in a different process. * 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. * before you can make this call.
**/ **/
void 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_IS_SOCKET (socket));
g_return_if_fail (GTK_WIDGET_ANCHORED (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)) if (!GTK_WIDGET_REALIZED (socket))
gtk_widget_realize (GTK_WIDGET (socket)); gtk_widget_realize (GTK_WIDGET (socket));
gtk_socket_add_window (socket, id, TRUE); gtk_socket_add_window (socket, window_id, TRUE);
} }
/** /**

2
gtk/gtksocket.h
View File

@ -80,7 +80,7 @@ GtkWidget* gtk_socket_new (void);
GtkType gtk_socket_get_type (void) G_GNUC_CONST; GtkType gtk_socket_get_type (void) G_GNUC_CONST;
void gtk_socket_add_id (GtkSocket *socket, void gtk_socket_add_id (GtkSocket *socket,
GdkNativeWindow id); GdkNativeWindow window_id);
GdkNativeWindow gtk_socket_get_id (GtkSocket *socket); GdkNativeWindow gtk_socket_get_id (GtkSocket *socket);
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED