Add a compat macro that got lost.

Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtknotebook.h: Add a compat macro that got lost.

        * gtk/gtktreestore.c: Doc fixes.

        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
        leak for windows that receive events after being destroyed.
        (#60863, Joshua N. Pritikin)

        * gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
        rather than gtk_container_queue_resize().

        * gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
        gtk_container_queue_resize, gtk_container_queue_resize_widgets,
        gtk_container_child_composite_name. (#60217.)

16 files changed, 147 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index c40eb9382c..5898d23345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.h: Add a compat macro that got lost.
+
+	* gtk/gtktreestore.c: Doc fixes.
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
+	leak for windows that receive events after being destroyed.
+	(#60863, Joshua N. Pritikin)
+
+	* gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
+	rather than gtk_container_queue_resize().
+
+	* gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
+	gtk_container_queue_resize, gtk_container_queue_resize_widgets,
+	gtk_container_child_composite_name. (#60217.)
+
 2001-09-22  Hans Breuer  <hans@breuer.org>
 
 	* gtk/gtkmenu.h : fix compat macros for gtk_menu_<prepend|insert>
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c40eb9382c..5898d23345 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.h: Add a compat macro that got lost.
+
+	* gtk/gtktreestore.c: Doc fixes.
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
+	leak for windows that receive events after being destroyed.
+	(#60863, Joshua N. Pritikin)
+
+	* gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
+	rather than gtk_container_queue_resize().
+
+	* gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
+	gtk_container_queue_resize, gtk_container_queue_resize_widgets,
+	gtk_container_child_composite_name. (#60217.)
+
 2001-09-22  Hans Breuer  <hans@breuer.org>
 
 	* gtk/gtkmenu.h : fix compat macros for gtk_menu_<prepend|insert>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c40eb9382c..5898d23345 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.h: Add a compat macro that got lost.
+
+	* gtk/gtktreestore.c: Doc fixes.
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
+	leak for windows that receive events after being destroyed.
+	(#60863, Joshua N. Pritikin)
+
+	* gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
+	rather than gtk_container_queue_resize().
+
+	* gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
+	gtk_container_queue_resize, gtk_container_queue_resize_widgets,
+	gtk_container_child_composite_name. (#60217.)
+
 2001-09-22  Hans Breuer  <hans@breuer.org>
 
 	* gtk/gtkmenu.h : fix compat macros for gtk_menu_<prepend|insert>
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c40eb9382c..5898d23345 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.h: Add a compat macro that got lost.
+
+	* gtk/gtktreestore.c: Doc fixes.
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
+	leak for windows that receive events after being destroyed.
+	(#60863, Joshua N. Pritikin)
+
+	* gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
+	rather than gtk_container_queue_resize().
+
+	* gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
+	gtk_container_queue_resize, gtk_container_queue_resize_widgets,
+	gtk_container_child_composite_name. (#60217.)
+
 2001-09-22  Hans Breuer  <hans@breuer.org>
 
 	* gtk/gtkmenu.h : fix compat macros for gtk_menu_<prepend|insert>
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c40eb9382c..5898d23345 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.h: Add a compat macro that got lost.
+
+	* gtk/gtktreestore.c: Doc fixes.
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
+	leak for windows that receive events after being destroyed.
+	(#60863, Joshua N. Pritikin)
+
+	* gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
+	rather than gtk_container_queue_resize().
+
+	* gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
+	gtk_container_queue_resize, gtk_container_queue_resize_widgets,
+	gtk_container_child_composite_name. (#60217.)
+
 2001-09-22  Hans Breuer  <hans@breuer.org>
 
 	* gtk/gtkmenu.h : fix compat macros for gtk_menu_<prepend|insert>
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c40eb9382c..5898d23345 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.h: Add a compat macro that got lost.
+
+	* gtk/gtktreestore.c: Doc fixes.
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
+	leak for windows that receive events after being destroyed.
+	(#60863, Joshua N. Pritikin)
+
+	* gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
+	rather than gtk_container_queue_resize().
+
+	* gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
+	gtk_container_queue_resize, gtk_container_queue_resize_widgets,
+	gtk_container_child_composite_name. (#60217.)
+
 2001-09-22  Hans Breuer  <hans@breuer.org>
 
 	* gtk/gtkmenu.h : fix compat macros for gtk_menu_<prepend|insert>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c40eb9382c..5898d23345 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.h: Add a compat macro that got lost.
+
+	* gtk/gtktreestore.c: Doc fixes.
+
+	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
+	leak for windows that receive events after being destroyed.
+	(#60863, Joshua N. Pritikin)
+
+	* gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
+	rather than gtk_container_queue_resize().
+
+	* gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
+	gtk_container_queue_resize, gtk_container_queue_resize_widgets,
+	gtk_container_child_composite_name. (#60217.)
+
 2001-09-22  Hans Breuer  <hans@breuer.org>
 
 	* gtk/gtkmenu.h : fix compat macros for gtk_menu_<prepend|insert>
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index ca05f1ba96..02f2a78035 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -519,7 +519,10 @@ gdk_event_translate (GdkEvent *event,
   if (window_private && GDK_WINDOW_DESTROYED (window))
     {
       if (xevent->type != DestroyNotify)
-        return FALSE;
+	{
+	  return_val = FALSE;
+	  goto done;
+	}
     }
   else if (window_private)
     {
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index b9e35d47d1..dac0433e92 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -719,7 +719,7 @@ gtk_container_destroy (GtkObject *object)
   if (GTK_CONTAINER_RESIZE_PENDING (container))
     _gtk_container_dequeue_resize_handler (container);
   if (container->resize_widgets)
-    gtk_container_clear_resize_widgets (container);
+    _gtk_container_clear_resize_widgets (container);
 
   /* do this before walking child widgets, to avoid
    * removing children from focus chain one by one.
@@ -905,7 +905,7 @@ _gtk_container_dequeue_resize_handler (GtkContainer *container)
 }
 
 void
-gtk_container_clear_resize_widgets (GtkContainer *container)
+_gtk_container_clear_resize_widgets (GtkContainer *container)
 {
   GSList *node;
 
@@ -949,7 +949,7 @@ gtk_container_set_resize_mode (GtkContainer  *container,
 	gtk_container_check_resize (container);
       else
 	{
-	  gtk_container_clear_resize_widgets (container);
+	  _gtk_container_clear_resize_widgets (container);
 	  gtk_widget_queue_resize (GTK_WIDGET (container));
 	}
        g_object_notify (G_OBJECT (container), "resize_mode");
@@ -1032,7 +1032,7 @@ gtk_container_idle_sizer (gpointer data)
 }
 
 void
-gtk_container_queue_resize (GtkContainer *container)
+_gtk_container_queue_resize (GtkContainer *container)
 {
   GtkContainer *resize_container;
   
@@ -1045,7 +1045,7 @@ gtk_container_queue_resize (GtkContainer *container)
    * processing or their resize handler to be queued.
    */
   if (GTK_IS_RESIZE_CONTAINER (container))
-    gtk_container_clear_resize_widgets (container);
+    _gtk_container_clear_resize_widgets (container);
   if (GTK_OBJECT_DESTROYED (container) ||
       GTK_WIDGET_RESIZE_NEEDED (container))
     return;
@@ -1192,7 +1192,7 @@ gtk_container_resize_children (GtkContainer *container)
        * resize_widgets list.
        */
       if (resize_container->parent)
-	gtk_container_queue_resize (container);
+	_gtk_container_queue_resize (container);
       else
 	gtk_widget_size_allocate (GTK_WIDGET (container),
 				  &GTK_WIDGET (container)->allocation);
@@ -1454,7 +1454,7 @@ gtk_container_child_default_composite_name (GtkContainer *container,
 }
 
 gchar*
-gtk_container_child_composite_name (GtkContainer *container,
+_gtk_container_child_composite_name (GtkContainer *container,
 				    GtkWidget    *child)
 {
   g_return_val_if_fail (container != NULL, NULL);
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index ceb1272991..98f7be851d 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -201,13 +201,14 @@ void	     gtk_container_child_get_property		(GtkContainer	   *container,
     G_OBJECT_WARN_INVALID_PSPEC ((object), "child property id", (property_id), (pspec))
 
 
-/* Non-public methods */
-void	gtk_container_queue_resize	     (GtkContainer *container);
-void    gtk_container_clear_resize_widgets   (GtkContainer *container);
 void    gtk_container_forall		     (GtkContainer *container,
 					      GtkCallback   callback,
 					      gpointer	    callback_data);
-gchar*	gtk_container_child_composite_name   (GtkContainer *container,
+
+/* Non-public methods */
+void	_gtk_container_queue_resize	     (GtkContainer *container);
+void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
+gchar*	_gtk_container_child_composite_name   (GtkContainer *container,
 					      GtkWidget	   *child);
 void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
 
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index cead604b3b..447b9b1e08 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -224,6 +224,7 @@ void gtk_notebook_reorder_child           (GtkNotebook *notebook,
 
 #ifndef GTK_DISABLE_DEPRECATED
 #define	gtk_notebook_current_page               gtk_notebook_get_current_page
+#define gtk_notebook_set_page                   gtk_notebook_set_current_page
 #endif /* GTK_DISABLE_DEPRECATED */
 
 #ifdef __cplusplus
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c
index ccd7100688..f834a4ba48 100644
--- a/gtk/gtksizegroup.c
+++ b/gtk/gtksizegroup.c
@@ -117,12 +117,12 @@ static void
 real_queue_resize (GtkWidget *widget)
 {
   if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+    _gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
   
   if (widget->parent)
-    gtk_container_queue_resize (GTK_CONTAINER (widget->parent));
+    _gtk_container_queue_resize (GTK_CONTAINER (widget->parent));
   else if (GTK_WIDGET_TOPLEVEL (widget) && GTK_IS_CONTAINER (widget))
-    gtk_container_queue_resize (GTK_CONTAINER (widget));
+    _gtk_container_queue_resize (GTK_CONTAINER (widget));
 }
 
 static void
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 32f7d51ca3..86b8edb90c 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -909,7 +909,7 @@ gtk_table_remove (GtkContainer *container,
 	  g_free (child);
 	  
 	  if (was_visible && GTK_WIDGET_VISIBLE (container))
-	    gtk_container_queue_resize (container);
+	    gtk_widget_queue_resize (GTK_WIDGET (container));
 	  break;
 	}
     }
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 408cccebe8..8dc86421ae 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -945,7 +945,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store,
 
 /**
  * gtk_tree_store_insert:
- * @list_store: A #GtkListStore
+ * @tree_store: A #GtkListStore
  * @iter: An unset #GtkTreeIter to set to the new row
  * @parent: A valid #GtkTreeIter, or %NULL
  * @position: position to insert the new row
@@ -993,7 +993,7 @@ gtk_tree_store_insert (GtkTreeStore *tree_store,
  * gtk_tree_store_insert_before:
  * @tree_store: A #GtkTreeStore
  * @iter: An unset #GtkTreeIter to set to the new row
- * parent: A valid #GtkTreeIter, or %NULL
+ * @parent: A valid #GtkTreeIter, or %NULL
  * @sibling: A valid #GtkTreeIter, or %NULL
  *
  * Inserts a new row before @sibling.  If @sibling is %NULL, then the row will
@@ -1057,7 +1057,7 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store,
  * gtk_tree_store_insert_after:
  * @tree_store: A #GtkTreeStore
  * @iter: An unset #GtkTreeIter to set to the new row
- * parent: A valid #GtkTreeIter, or %NULL
+ * @parent: A valid #GtkTreeIter, or %NULL
  * @sibling: A valid #GtkTreeIter, or %NULL
  *
  * Inserts a new row after @sibling.  If @sibling is %NULL, then the row will be
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 6227967e7e..bd99fc5b0c 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1470,7 +1470,7 @@ gtk_widget_unparent (GtkWidget *widget)
     toplevel = NULL;
 
   if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+    _gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
   
   /* Remove the widget and all its children from any ->resize_widgets list
    * of all the parents in our branch. This code should move into gtkcontainer.c
@@ -2305,7 +2305,7 @@ gtk_widget_size_allocate (GtkWidget	*widget,
     }
 
   if (GTK_IS_RESIZE_CONTAINER (widget))
-    gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+    _gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
 
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
 
@@ -4895,7 +4895,7 @@ gtk_widget_get_composite_name (GtkWidget *widget)
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
   if (GTK_WIDGET_COMPOSITE_CHILD (widget) && widget->parent)
-    return gtk_container_child_composite_name (GTK_CONTAINER (widget->parent),
+    return _gtk_container_child_composite_name (GTK_CONTAINER (widget->parent),
 					       widget);
   else
     return NULL;
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 6b0515f149..53a4099d3e 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3028,7 +3028,7 @@ gtk_window_realize (GtkWidget *widget)
 	}
       gtk_widget_size_allocate (widget, &allocation);
       
-      gtk_container_queue_resize (GTK_CONTAINER (widget));
+      _gtk_container_queue_resize (GTK_CONTAINER (widget));
 
       g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
     }