Patch for objective C

[Elliot Lee <sopwith redhat com>]

I meant to get this out earlier, *sigh*

New obgtk coming tomorrow, probably, supporting the features in the new
gtk snapshot, including *tada* connecting signals to methods :-)

-- Elliot - http://www.redhat.com/
What's nice about GUI is that you see what you manipulate.
What's bad about GUI is that you can only manipulate what you see.

| http://www.cauce.org/ | http://www.linuxnet.org/ |
--- gtk+970915/gdk/gdk.h.objc	Tue Sep 16 00:45:30 1997
+++ gtk+970915/gdk/gdk.h	Tue Sep 16 00:45:37 1997
@@ -108,7 +108,7 @@
 				      GdkWindowAttr *attributes,
 				      gint           attributes_mask);
 
-GdkWindow *   gdk_window_foreign_new (guint32 id);
+GdkWindow *   gdk_window_foreign_new (guint32 anid);
 void          gdk_window_destroy     (GdkWindow     *window);
 
 void          gdk_window_show        (GdkWindow    *window);
--- gtk+970915/gdk/gdkwindow.c.objc	Tue Sep 16 00:45:46 1997
+++ gtk+970915/gdk/gdkwindow.c	Tue Sep 16 00:49:22 1997
@@ -277,7 +277,7 @@
 }
 
 GdkWindow *
-gdk_window_foreign_new (guint32 id)
+gdk_window_foreign_new (guint32 anid)
 {
   GdkWindow *window;
   GdkWindowPrivate *private;
@@ -286,10 +286,10 @@
   private = g_new (GdkWindowPrivate, 1);
   window = (GdkWindow*) private;
 
-  XGetWindowAttributes (gdk_display, id, &attrs);
+  XGetWindowAttributes (gdk_display, anid, &attrs);
 
   private->parent = NULL;
-  private->xwindow = id;
+  private->xwindow = anid;
   private->xdisplay = gdk_display;
   private->x = attrs.x;
   private->y = attrs.y;
@@ -297,7 +297,7 @@
   private->height = attrs.height;
   private->resize_count = 0;
   private->ref_count = 1;
-  if (id == attrs.root)
+  if (anid == attrs.root)
     private->window_type = GDK_WINDOW_ROOT;
   else
     private->window_type = GDK_WINDOW_TOPLEVEL;
--- gtk+970915/gtk/gtksignal.h.objc	Tue Sep 16 00:44:07 1997
+++ gtk+970915/gtk/gtksignal.h	Tue Sep 16 00:44:21 1997
@@ -96,15 +96,15 @@
 					   GtkSignalDestroy     destroy_func,
 					   gint                 after);
 void   gtk_signal_disconnect              (GtkObject           *object,
-					   gint                 id);
+					   gint                 _id);
 void   gtk_signal_disconnect_by_data      (GtkObject           *object,
 					   gpointer             data);
 void   gtk_signal_handler_block           (GtkObject           *object,
-					   gint                 id);
+					   gint                 _id);
 void   gtk_signal_handler_block_by_data   (GtkObject           *object,
 					   gpointer             data);
 void   gtk_signal_handler_unblock         (GtkObject           *object,
-					   gint                 id);
+					   gint                 _id);
 void   gtk_signal_handler_unblock_by_data (GtkObject           *object,
 					   gpointer            data);
 void   gtk_signal_handlers_destroy        (GtkObject           *object);
--- gtk+970915/gtk/gtksignal.c.objc	Tue Sep 16 00:44:52 1997
+++ gtk+970915/gtk/gtksignal.c	Tue Sep 16 00:45:16 1997
@@ -472,7 +472,7 @@
 
 void
 gtk_signal_disconnect (GtkObject *object,
-		       gint       id)
+		       gint       anid)
 {
   GtkHandler *tmp;
   GtkHandler *prev;
@@ -487,7 +487,7 @@
 
   while (tmp)
     {
-      if (tmp->id == id)
+      if (tmp->id == anid)
 	{
 	  if (prev)
 	    prev->next = tmp->next;
@@ -501,7 +501,7 @@
       tmp = tmp->next;
     }
 
-  g_warning ("could not find handler (%d)", id);
+  g_warning ("could not find handler (%d)", anid);
 }
 
 void
@@ -561,7 +561,7 @@
 
 void
 gtk_signal_handler_block (GtkObject *object,
-			  gint      id)
+			  gint      anid)
 {
   GtkHandler *tmp;
 
@@ -574,7 +574,7 @@
 
   while (tmp)
     {
-      if (tmp->id == id)
+      if (tmp->id == anid)
 	{
 	  tmp->blocked = TRUE;
 	  return;
@@ -583,7 +583,7 @@
       tmp = tmp->next;
     }
 
-  g_warning ("could not find handler (%d)", id);
+  g_warning ("could not find handler (%d)", anid);
 }
 
 void
@@ -618,7 +618,7 @@
 
 void
 gtk_signal_handler_unblock (GtkObject *object,
-			    gint       id)
+			    gint       anid)
 {
   GtkHandler *tmp;
 
@@ -631,7 +631,7 @@
 
   while (tmp)
     {
-      if (tmp->id == id)
+      if (tmp->id == anid)
 	{
 	  tmp->blocked = FALSE;
 	  return;
@@ -640,7 +640,7 @@
       tmp = tmp->next;
     }
 
-  g_warning ("could not find handler (%d)", id);
+  g_warning ("could not find handler (%d)", anid);
 }
 
 void