removed deprecated functions: gtk_clist_set_border,

Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>

        * gtk/gtkwidget.[hc]:
        * gtk/gtkspinbutton.[hc]:
        * gtk/gtkscrolledwindow.[hc]:
        * gtk/gtkprogressbar.[hc]:
        * gtk/gtkpreview.[hc]:
        * gtk/gtkobject.[hc]:
        * gtk/gtkentry.[hc]:
        * gtk/gtkctree.[hc]:
        * gtk/gtkcontainer.[hc]:
        * gtk/gtkclist.[hc]:
        removed deprecated functions: gtk_clist_set_border,
        gtk_container_block_resize, gtk_container_unblock_resize,
        gtk_container_need_resize, gtk_ctree_set_reorderable,
        gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
        gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
        gtk_preview_put_row, gtk_progress_bar_construct,
        gtk_scrolled_window_construct, gtk_spin_button_construct,
        gtk_widget_freeze_accelerators, gtk_widget_thaw_accelerators.

        * gtk/gtkcheckmenuitem.c: removed binary variant of
        gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
        though.

        * docs/Changes-1.2.txt:
        removed section about gtk_idle_remove_by_data vs.
        gtk_timeout_remove_by_data, we actually don't even provide a
        gtk_timeout_remove_by_data() function.
        added a table with removed functions and their replacements.

        * NEWS: updates for 1.1.13.

31 files changed, 300 insertions, 283 deletions

diff --git a/ChangeLog b/ChangeLog
index b0acd2f57..aac5b8899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.[hc]: 
+	* gtk/gtkspinbutton.[hc]: 
+	* gtk/gtkscrolledwindow.[hc]:
+	* gtk/gtkprogressbar.[hc]:
+	* gtk/gtkpreview.[hc]: 
+	* gtk/gtkobject.[hc]:
+	* gtk/gtkentry.[hc]: 
+	* gtk/gtkctree.[hc]:
+	* gtk/gtkcontainer.[hc]:
+	* gtk/gtkclist.[hc]:
+	removed deprecated functions: gtk_clist_set_border,
+	gtk_container_block_resize, gtk_container_unblock_resize,
+	gtk_container_need_resize, gtk_ctree_set_reorderable,
+	gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
+	gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
+	gtk_preview_put_row, gtk_progress_bar_construct,
+	gtk_scrolled_window_construct, gtk_spin_button_construct,
+	gtk_widget_freeze_accelerators,	gtk_widget_thaw_accelerators.
+
+	* gtk/gtkcheckmenuitem.c: removed binary variant of
+	gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
+	though.
+
+	* docs/Changes-1.2.txt:
+	removed section about gtk_idle_remove_by_data vs.
+	gtk_timeout_remove_by_data, we actually don't even provide a
+	gtk_timeout_remove_by_data() function.
+	added a table with removed functions and their replacements.
+	
+	* NEWS: updates for 1.1.13.
+
 Sun Jan 17 17:56:33 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Felix Bellaby <felix@pooh.u-net.com>
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b0acd2f57..aac5b8899 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,36 @@
+Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.[hc]: 
+	* gtk/gtkspinbutton.[hc]: 
+	* gtk/gtkscrolledwindow.[hc]:
+	* gtk/gtkprogressbar.[hc]:
+	* gtk/gtkpreview.[hc]: 
+	* gtk/gtkobject.[hc]:
+	* gtk/gtkentry.[hc]: 
+	* gtk/gtkctree.[hc]:
+	* gtk/gtkcontainer.[hc]:
+	* gtk/gtkclist.[hc]:
+	removed deprecated functions: gtk_clist_set_border,
+	gtk_container_block_resize, gtk_container_unblock_resize,
+	gtk_container_need_resize, gtk_ctree_set_reorderable,
+	gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
+	gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
+	gtk_preview_put_row, gtk_progress_bar_construct,
+	gtk_scrolled_window_construct, gtk_spin_button_construct,
+	gtk_widget_freeze_accelerators,	gtk_widget_thaw_accelerators.
+
+	* gtk/gtkcheckmenuitem.c: removed binary variant of
+	gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
+	though.
+
+	* docs/Changes-1.2.txt:
+	removed section about gtk_idle_remove_by_data vs.
+	gtk_timeout_remove_by_data, we actually don't even provide a
+	gtk_timeout_remove_by_data() function.
+	added a table with removed functions and their replacements.
+	
+	* NEWS: updates for 1.1.13.
+
 Sun Jan 17 17:56:33 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Felix Bellaby <felix@pooh.u-net.com>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b0acd2f57..aac5b8899 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,36 @@
+Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.[hc]: 
+	* gtk/gtkspinbutton.[hc]: 
+	* gtk/gtkscrolledwindow.[hc]:
+	* gtk/gtkprogressbar.[hc]:
+	* gtk/gtkpreview.[hc]: 
+	* gtk/gtkobject.[hc]:
+	* gtk/gtkentry.[hc]: 
+	* gtk/gtkctree.[hc]:
+	* gtk/gtkcontainer.[hc]:
+	* gtk/gtkclist.[hc]:
+	removed deprecated functions: gtk_clist_set_border,
+	gtk_container_block_resize, gtk_container_unblock_resize,
+	gtk_container_need_resize, gtk_ctree_set_reorderable,
+	gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
+	gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
+	gtk_preview_put_row, gtk_progress_bar_construct,
+	gtk_scrolled_window_construct, gtk_spin_button_construct,
+	gtk_widget_freeze_accelerators,	gtk_widget_thaw_accelerators.
+
+	* gtk/gtkcheckmenuitem.c: removed binary variant of
+	gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
+	though.
+
+	* docs/Changes-1.2.txt:
+	removed section about gtk_idle_remove_by_data vs.
+	gtk_timeout_remove_by_data, we actually don't even provide a
+	gtk_timeout_remove_by_data() function.
+	added a table with removed functions and their replacements.
+	
+	* NEWS: updates for 1.1.13.
+
 Sun Jan 17 17:56:33 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Felix Bellaby <felix@pooh.u-net.com>
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b0acd2f57..aac5b8899 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,36 @@
+Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.[hc]: 
+	* gtk/gtkspinbutton.[hc]: 
+	* gtk/gtkscrolledwindow.[hc]:
+	* gtk/gtkprogressbar.[hc]:
+	* gtk/gtkpreview.[hc]: 
+	* gtk/gtkobject.[hc]:
+	* gtk/gtkentry.[hc]: 
+	* gtk/gtkctree.[hc]:
+	* gtk/gtkcontainer.[hc]:
+	* gtk/gtkclist.[hc]:
+	removed deprecated functions: gtk_clist_set_border,
+	gtk_container_block_resize, gtk_container_unblock_resize,
+	gtk_container_need_resize, gtk_ctree_set_reorderable,
+	gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
+	gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
+	gtk_preview_put_row, gtk_progress_bar_construct,
+	gtk_scrolled_window_construct, gtk_spin_button_construct,
+	gtk_widget_freeze_accelerators,	gtk_widget_thaw_accelerators.
+
+	* gtk/gtkcheckmenuitem.c: removed binary variant of
+	gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
+	though.
+
+	* docs/Changes-1.2.txt:
+	removed section about gtk_idle_remove_by_data vs.
+	gtk_timeout_remove_by_data, we actually don't even provide a
+	gtk_timeout_remove_by_data() function.
+	added a table with removed functions and their replacements.
+	
+	* NEWS: updates for 1.1.13.
+
 Sun Jan 17 17:56:33 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Felix Bellaby <felix@pooh.u-net.com>
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b0acd2f57..aac5b8899 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,36 @@
+Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.[hc]: 
+	* gtk/gtkspinbutton.[hc]: 
+	* gtk/gtkscrolledwindow.[hc]:
+	* gtk/gtkprogressbar.[hc]:
+	* gtk/gtkpreview.[hc]: 
+	* gtk/gtkobject.[hc]:
+	* gtk/gtkentry.[hc]: 
+	* gtk/gtkctree.[hc]:
+	* gtk/gtkcontainer.[hc]:
+	* gtk/gtkclist.[hc]:
+	removed deprecated functions: gtk_clist_set_border,
+	gtk_container_block_resize, gtk_container_unblock_resize,
+	gtk_container_need_resize, gtk_ctree_set_reorderable,
+	gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
+	gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
+	gtk_preview_put_row, gtk_progress_bar_construct,
+	gtk_scrolled_window_construct, gtk_spin_button_construct,
+	gtk_widget_freeze_accelerators,	gtk_widget_thaw_accelerators.
+
+	* gtk/gtkcheckmenuitem.c: removed binary variant of
+	gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
+	though.
+
+	* docs/Changes-1.2.txt:
+	removed section about gtk_idle_remove_by_data vs.
+	gtk_timeout_remove_by_data, we actually don't even provide a
+	gtk_timeout_remove_by_data() function.
+	added a table with removed functions and their replacements.
+	
+	* NEWS: updates for 1.1.13.
+
 Sun Jan 17 17:56:33 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Felix Bellaby <felix@pooh.u-net.com>
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b0acd2f57..aac5b8899 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,36 @@
+Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.[hc]: 
+	* gtk/gtkspinbutton.[hc]: 
+	* gtk/gtkscrolledwindow.[hc]:
+	* gtk/gtkprogressbar.[hc]:
+	* gtk/gtkpreview.[hc]: 
+	* gtk/gtkobject.[hc]:
+	* gtk/gtkentry.[hc]: 
+	* gtk/gtkctree.[hc]:
+	* gtk/gtkcontainer.[hc]:
+	* gtk/gtkclist.[hc]:
+	removed deprecated functions: gtk_clist_set_border,
+	gtk_container_block_resize, gtk_container_unblock_resize,
+	gtk_container_need_resize, gtk_ctree_set_reorderable,
+	gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
+	gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
+	gtk_preview_put_row, gtk_progress_bar_construct,
+	gtk_scrolled_window_construct, gtk_spin_button_construct,
+	gtk_widget_freeze_accelerators,	gtk_widget_thaw_accelerators.
+
+	* gtk/gtkcheckmenuitem.c: removed binary variant of
+	gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
+	though.
+
+	* docs/Changes-1.2.txt:
+	removed section about gtk_idle_remove_by_data vs.
+	gtk_timeout_remove_by_data, we actually don't even provide a
+	gtk_timeout_remove_by_data() function.
+	added a table with removed functions and their replacements.
+	
+	* NEWS: updates for 1.1.13.
+
 Sun Jan 17 17:56:33 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Felix Bellaby <felix@pooh.u-net.com>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b0acd2f57..aac5b8899 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,36 @@
+Sun Jan 17 22:47:15 1999  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkwidget.[hc]: 
+	* gtk/gtkspinbutton.[hc]: 
+	* gtk/gtkscrolledwindow.[hc]:
+	* gtk/gtkprogressbar.[hc]:
+	* gtk/gtkpreview.[hc]: 
+	* gtk/gtkobject.[hc]:
+	* gtk/gtkentry.[hc]: 
+	* gtk/gtkctree.[hc]:
+	* gtk/gtkcontainer.[hc]:
+	* gtk/gtkclist.[hc]:
+	removed deprecated functions: gtk_clist_set_border,
+	gtk_container_block_resize, gtk_container_unblock_resize,
+	gtk_container_need_resize, gtk_ctree_set_reorderable,
+	gtk_ctree_show_stub, gtk_ctree_set_use_drag_icons,
+	gtk_entry_adjust_scroll, gtk_object_class_add_user_signal,
+	gtk_preview_put_row, gtk_progress_bar_construct,
+	gtk_scrolled_window_construct, gtk_spin_button_construct,
+	gtk_widget_freeze_accelerators,	gtk_widget_thaw_accelerators.
+
+	* gtk/gtkcheckmenuitem.c: removed binary variant of
+	gtk_check_menu_item_set_state, this is still defined in gtkcompat.h
+	though.
+
+	* docs/Changes-1.2.txt:
+	removed section about gtk_idle_remove_by_data vs.
+	gtk_timeout_remove_by_data, we actually don't even provide a
+	gtk_timeout_remove_by_data() function.
+	added a table with removed functions and their replacements.
+	
+	* NEWS: updates for 1.1.13.
+
 Sun Jan 17 17:56:33 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Patch from Felix Bellaby <felix@pooh.u-net.com>
diff --git a/NEWS b/NEWS
index ad85098af..94ad58b93 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+What is new in GTK+ 1.1.13:
+
+* Dnd and selection bug fixes and memory purification.
+* Widget sensitivity fixups.
+* Tooltips windows are now named "gtk-tooltips" so rc file rules
+  can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
+  widgets.
+* Spin buttons now update their values upon value retrival.
+* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
+  a lot. Gtk makes full use of the draw_area coalescing code now, which
+  got minorly improved as well.
+* Containers map their Gdk windows after their children now to reduce
+  expose event generation.
+* Gdk event queue fixups, this solves the double-click problems people were
+  recently having.
+* Account for the fact that GSource's are only properly reentrant from
+  within dispatch(), thus we don't do Gdk event processing from within
+  check() or prepare() anymore.
+* Rc files feature a bg_pixmap value of "<none>" now.
+* Improved session management support in Gdk.  
+* Automatic disabling of NLS if no gettext is found should work now.
+* Removed deprecated functions, docs/Changes-1.2.txt gives an overview.
+* Gtk+ development now requires GNU autoconf 2.13, GNU automake 1.4
+  and GNU libtool 1.2d.
+* More bug fixes all over the place.
+
 What is new in GTK+ 1.1.12:
 
 * Korean translation added
diff --git a/docs/Changes-1.2.txt b/docs/Changes-1.2.txt
index afd6e02ef..40313e6d7 100644
--- a/docs/Changes-1.2.txt
+++ b/docs/Changes-1.2.txt
@@ -3,12 +3,40 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
 * GtkAcceleratorTable has been replaced with GtkAccelGroup
 
 * GtkMenuFactory has been replaced with GtkItemFactory, although
-  a version of GtkMenuFactory is provided to ease compatibility.
-
-* GtkButton has been changed to derive from GtkBin. 
- 
- To access a button's child, use GTK_BIN (button)->child, instead
- of the old GTK_BUTTON (button)->child.
+  a version of GtkMenuFactory is currently still provided to ease
+  the migration phase.
+
+* A number of Gtk functions got renamed. For compatibility, function
+  name aliases covering the old 1.0.x function names are defined in
+  gtkcompat.h. To asure your Gtk program doesn't rely on outdated function
+  variants, compile you program with -DGTK_DISABLE_COMPAT_H to disable
+  the compatibility aliases.
+
+* During the development phase of the 1.1.x line of Gtk certain functions
+  got deprecated and later removed. Functions affected are:
+  Removed:                          Replacement:
+  gtk_clist_set_border		    gtk_clist_set_shadow_type
+  gtk_container_block_resize	    gtk_container_set_resize_mode
+  gtk_container_unblock_resize	    gtk_container_set_resize_mode
+  gtk_container_need_resize	    gtk_container_check_resize
+  gtk_ctree_show_stub		    gtk_ctree_set_show_stub
+  gtk_ctree_set_reorderable	    gtk_clist_set_reorderable
+  gtk_ctree_set_use_drag_icons	    gtk_clist_set_use_drag_icons
+  gtk_entry_adjust_scroll	    %
+  gtk_object_class_add_user_signal  gtk_object_class_user_signal_new
+  gtk_preview_put_row		    %
+  gtk_progress_bar_construct	    gtk_progress_set_adjustment
+  gtk_scrolled_window_construct	    gtk_scrolled_window_set_{h|v}adjustment
+  gtk_spin_button_construct	    gtk_spin_button_configure
+  gtk_widget_thaw_accelerators	    gtk_widget_unlock_accelerators
+  gtk_widget_freeze_accelerators    gtk_widget_lock_accelerators
+
+* Additionally, all gtk_*_interp function variants got removed, as a
+  replacement gtk_*_full variants are provided now.
+
+* GtkButton has been changed to derive from GtkBin.
+  To access a button's child, use GTK_BIN (button)->child, instead
+  of the old GTK_BUTTON (button)->child.
 
 * The selection API has been slightly modified:
 
@@ -90,13 +118,6 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
   been provided. However, you may want to consider migrating
   your code to use the GLib main loop directly.
 
-  Minor known incompatibilities:
-
-  - gtk_idle_remove_by_data() and gtk_timeout_remove_by_data() now
-    work from a common pool of "input sources", so 
-    gtk_idle_remove_by_data() will remove timeouts and 
-    vice-versa.
-
 * the GTK_BASIC flag was removed, and with it the corresponding
   macro and function GTK_WIDGET_BASIC() and gtk_widget_basic().
   
@@ -153,9 +174,3 @@ Incompatible Changes from GTK+-1.0 to GTK+-1.2:
       b) Link with the libraries returned by:
  
            gtk-config --libs gthread
-
-* All functions matching g_message* are deprecated
-
-* Functions *_interp are deprecated, *_full variants are available
-  instead
-
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index f7563682a..af09b98bb 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -95,13 +95,6 @@ gtk_check_menu_item_new_with_label (const gchar *label)
   return check_menu_item;
 }
 
-void /* FIXME remove gtk_check_menu_item_set_state, this function is deprecated */
-gtk_check_menu_item_set_state (GtkCheckMenuItem *check_menu_item,
-			       gint              state)
-{
-  gtk_check_menu_item_set_active (check_menu_item, state);
-}
-
 void
 gtk_check_menu_item_set_active (GtkCheckMenuItem *check_menu_item,
 				gboolean          is_active)
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index d35b04c1c..6cf880e8d 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1106,7 +1106,6 @@ gtk_clist_construct (GtkCList *clist,
  *   gtk_clist_get_hadjustment
  *   gtk_clist_get_vadjustment
  *   gtk_clist_set_shadow_type
- *   gtk_clist_set_border *** deprecated function ***
  *   gtk_clist_set_selection_mode
  *   gtk_clist_freeze
  *   gtk_clist_thaw
@@ -1253,16 +1252,6 @@ gtk_clist_set_shadow_type (GtkCList      *clist,
     gtk_widget_queue_resize (GTK_WIDGET (clist));
 }
 
-/* deprecated function, use gtk_clist_set_shadow_type instead. */
-void
-gtk_clist_set_border (GtkCList      *clist,
-		      GtkShadowType  border)
-{
-  g_message ("gtk_clist_set_border() is deprecated");
-
-  gtk_clist_set_shadow_type (clist, border);
-}
-
 void
 gtk_clist_set_selection_mode (GtkCList         *clist,
 			      GtkSelectionMode  mode)
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 87fa02f42..1ca043b22 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -770,12 +770,6 @@ void gtk_clist_set_auto_sort (GtkCList *clist,
 			      gboolean  auto_sort);
 
 
-/* Deprecated methods */
-
-/* Use gtk_clist_set_shadow_type instead. */
-void gtk_clist_set_border (GtkCList      *clist,
-			   GtkShadowType  border);
-
 #ifdef __cplusplus
 }
 #endif				/* __cplusplus */
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index e1b3e02aa..e9b405bd1 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -712,24 +712,6 @@ gtk_container_remove (GtkContainer *container,
 }
 
 void
-gtk_container_block_resize (GtkContainer *container)
-{
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-
-  g_message ("gtk_container_block_resize() is deprecated");
-}
-
-void
-gtk_container_unblock_resize (GtkContainer *container)
-{
-  g_return_if_fail (container != NULL);
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-  
-  g_message ("gtk_container_unblock_resize() is deprecated");
-}
-
-void
 gtk_container_clear_resize_widgets (GtkContainer *container)
 {
   GSList *node;
@@ -782,15 +764,6 @@ gtk_container_set_resize_mode (GtkContainer  *container,
     }
 }
 
-gint    
-gtk_container_need_resize (GtkContainer     *container)
-{
-  g_message ("gtk_container_need_resize() is deprecated");
-
-  gtk_container_check_resize (container);
-  return FALSE;
-}
-
 static GtkContainer*
 gtk_container_get_resize_container (GtkContainer *container)
 {
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 61656f416..e2696fee1 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -213,15 +213,6 @@ gchar*	gtk_container_child_composite_name (GtkContainer *container,
 					    GtkWidget	 *child);
 
 
-/* Deprecated methods */
-
-/* Use gtk_container_set_resize_mode() instead */
-void    gtk_container_block_resize	 (GtkContainer	   *container);
-void    gtk_container_unblock_resize	 (GtkContainer	   *container);
-
-/* Use gtk_container_check_resize() instead */
-gint    gtk_container_need_resize        (GtkContainer     *container);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 96cf37de3..272418fb1 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -6062,32 +6062,3 @@ gtk_ctree_drag_data_received (GtkWidget        *widget,
 	}
     }
 }
-
-/* deprecated*/
-void
-gtk_ctree_set_reorderable (GtkCTree *ctree, 
-			   gboolean  reorderable)
-{
-  g_return_if_fail (ctree != NULL);
-  g_return_if_fail (GTK_IS_CTREE (ctree));
-
-  gtk_clist_set_reorderable (GTK_CLIST (ctree), reorderable);
-}
-
-void
-gtk_ctree_set_use_drag_icons (GtkCTree *ctree,
-			      gboolean  use_icons)
-{
-  g_return_if_fail (ctree != NULL);
-  g_return_if_fail (GTK_IS_CTREE (ctree));
-
-  gtk_clist_set_use_drag_icons (GTK_CLIST (ctree), use_icons);
-}
-
-void
-gtk_ctree_show_stub (GtkCTree *ctree,
-		     gboolean  show_stub)
-{
-  g_message ("gtk_ctree_show_stub() is deprecated");
-  gtk_ctree_set_show_stub (ctree, show_stub);
-}
diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index 6f710911e..cccb034b6 100644
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -424,14 +424,6 @@ void gtk_ctree_sort_recursive                    (GtkCTree     *ctree,
 						  GtkCTreeNode *node);
 
 
-/* deprecated*/
-void gtk_ctree_show_stub             (GtkCTree                *ctree, 
-				      gboolean                 show_stub);
-void gtk_ctree_set_reorderable       (GtkCTree                *ctree,
-				      gboolean                 reorderable);
-void gtk_ctree_set_use_drag_icons    (GtkCTree                *ctree,
-				      gboolean                 use_icons);
-
 
 #ifdef __cplusplus
 }
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 67cf4624f..27acadd8e 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1544,17 +1544,6 @@ gtk_entry_position (GtkEntry *entry,
   return gtk_entry_find_position(entry, x);
 }
 
-void
-gtk_entry_adjust_scroll (GtkEntry *entry)
-{
-  g_return_if_fail (entry != NULL);
-  g_return_if_fail (GTK_IS_ENTRY (entry));
-
-  g_message ("gtk_entry_adjust_scroll() is deprecated");
-
-  entry_adjust_scroll (entry);
-}
-
 static void
 entry_adjust_scroll (GtkEntry *entry)
 {
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index c1b6f9065..f29ccaaae 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -97,10 +97,6 @@ void       gtk_entry_set_editable   		(GtkEntry      *entry,
 /* text is truncated if needed */
 void       gtk_entry_set_max_length 		(GtkEntry      *entry,
 						 guint16        max);
-/* deprecated function. The only reason why it is public
- * is that there were bugs in GtkEntry. IT WILL DISAPPEAR.
- */
-void       gtk_entry_adjust_scroll  		(GtkEntry      *entry);
 
 #ifdef __cplusplus
 }
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 4110cc6f5..eb7f9f98f 100644
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -41,9 +41,6 @@ typedef	void	(*GtkItemFactoryCallback)  ();
 typedef	void	(*GtkItemFactoryCallback1) (gpointer		 callback_data,
 					    guint		 callback_action,
 					    GtkWidget		*widget);
-typedef	void	(*GtkItemFactoryCallback2) (GtkWidget		*widget,
-					    gpointer		 callback_data,
-					    guint		 callback_action);
 
 #define	GTK_TYPE_ITEM_FACTORY		 (gtk_item_factory_get_type ())
 #define	GTK_ITEM_FACTORY(object)	 (GTK_CHECK_CAST (object, GTK_TYPE_ITEM_FACTORY, GtkItemFactory))
@@ -165,11 +162,6 @@ void	gtk_item_factory_create_items	(GtkItemFactory		*ifactory,
 					 guint			 n_entries,
 					 GtkItemFactoryEntry	*entries,
 					 gpointer		 callback_data);
-void	gtk_item_factory_create_items_ac(GtkItemFactory		*ifactory,
-					 guint			 n_entries,
-					 GtkItemFactoryEntry	*entries,
-					 gpointer		 callback_data,
-					 guint			 callback_type);
 void	gtk_item_factory_delete_item	(GtkItemFactory		*ifactory,
 					 const gchar		*path);
 void	gtk_item_factory_delete_entry	(GtkItemFactory		*ifactory,
@@ -203,7 +195,14 @@ void	gtk_item_factory_create_menu_entries (guint		 n_entries,
 					      GtkMenuEntry      *entries);
 void	gtk_item_factories_path_delete	   (const gchar		*ifactory_path,
 					    const gchar		*path);
-
+typedef	void	(*GtkItemFactoryCallback2) (GtkWidget		*widget,
+					    gpointer		 callback_data,
+					    guint		 callback_action);
+void	gtk_item_factory_create_items_ac (GtkItemFactory	*ifactory,
+					  guint			 n_entries,
+					  GtkItemFactoryEntry	*entries,
+					  gpointer		 callback_data,
+					  guint			 callback_type);
 
 
 
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index dfa8f0c29..71ed1da70 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -353,54 +353,6 @@ gtk_object_class_add_signals (GtkObjectClass *class,
 }
 
 guint
-gtk_object_class_add_user_signal (GtkObjectClass     *class,
-				  const gchar        *name,
-				  GtkSignalMarshaller marshaller,
-				  GtkType             return_val,
-				  guint               nparams,
-				  ...)
-{
-  GtkType *params;
-  guint i;
-  va_list args;
-  guint signal_id;
-
-  g_return_val_if_fail (class != NULL, 0);
-
-  g_message ("gtk_object_class_add_user_signal() is deprecated");
-
-  if (nparams > 0)
-    {
-      params = g_new (GtkType, nparams);
-
-      va_start (args, nparams);
-
-      for (i = 0; i < nparams; i++)
-	params[i] = va_arg (args, GtkType);
-
-      va_end (args);
-    }
-  else
-    params = NULL;
-
-  signal_id = gtk_signal_newv (name,
-			       0,
-			       class->type,
-			       0,
-			       marshaller,
-			       return_val,
-			       nparams,
-			       params);
-
-  g_free (params);
-
-  if (signal_id)
-    gtk_object_class_add_signals (class, &signal_id, 1);
-
-  return signal_id;
-}
-
-guint
 gtk_object_class_user_signal_new (GtkObjectClass     *class,
 				  const gchar        *name,
 				  GtkSignalRunType    signal_flags,
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index e16006dd1..03cf88efa 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -353,15 +353,6 @@ void	gtk_trace_referencing	(GtkObject   *object,
 #endif	/* G_ENABLE_DEBUG */
 
 
-/* Deprecated methods */
-
-/* Use gtk_object_class_user_signal_new() instead */
-guint	gtk_object_class_add_user_signal (GtkObjectClass	*klass,
-					  const gchar		*name,
-					  GtkSignalMarshaller	 marshaller,
-					  GtkType		 return_val,
-					  guint			 nparams,
-					  ...);
 
 
 
diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c
index ef546c778..8558ca13e 100644
--- a/gtk/gtkpreview.c
+++ b/gtk/gtkpreview.c
@@ -229,17 +229,6 @@ gtk_preview_put (GtkPreview   *preview,
 }
 
 void
-gtk_preview_put_row (GtkPreview *preview,
-		     guchar     *src,
-		     guchar     *dest,
-		     gint        x,
-		     gint        y,
-		     gint        w)
-{
-  g_warning ("gtk_preview_put_row not implemented (deprecated)\n");
-}
-
-void
 gtk_preview_draw_row (GtkPreview *preview,
 		      guchar     *data,
 		      gint        x,
diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h
index 252569b30..48625dbe5 100644
--- a/gtk/gtkpreview.h
+++ b/gtk/gtkpreview.h
@@ -95,13 +95,6 @@ void            gtk_preview_put                (GtkPreview      *preview,
 						gint             desty,
 						gint             width,
 						gint             height);
-/* gtk_preview_put_row is broken */
-void            gtk_preview_put_row            (GtkPreview      *preview,
-						guchar          *src,
-						guchar          *dest,
-						gint             x,
-						gint             y,
-						gint             w);
 void            gtk_preview_draw_row           (GtkPreview      *preview,
 						guchar          *data,
 						gint             x,
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index d9ab28c03..15909be5a 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -241,18 +241,6 @@ gtk_progress_bar_new_with_adjustment (GtkAdjustment *adjustment)
   return pbar;
 }
 
-void
-gtk_progress_bar_construct (GtkProgressBar *pbar,
-			    GtkAdjustment  *adjustment)
-{
-  g_return_if_fail (pbar != NULL);
-  g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
-
-  g_message ("gtk_progress_bar_construct() is deprecated");
-
-  gtk_progress_set_adjustment (GTK_PROGRESS (pbar), adjustment);
-}
-
 static void
 gtk_progress_bar_real_update (GtkProgress *progress)
 {
@@ -756,7 +744,7 @@ gtk_progress_bar_update (GtkProgressBar *pbar,
   g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
 
   /***********************************************************************
-   *                 Use of this function is deprecated !	         * 
+   *          Use of gtk_progress_bar_update() is deprecated !	         * 
    * Use gtk_progress_set_value or gtk_progress_set_percentage instead.  *
    ***********************************************************************/
 
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 20debc3d7..14cf5baca 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -92,10 +92,6 @@ void       gtk_progress_bar_set_orientation      (GtkProgressBar *pbar,
 void       gtk_progress_bar_update               (GtkProgressBar *pbar,
 						  gfloat          percentage);
 
-/* deprecated */
-void       gtk_progress_bar_construct            (GtkProgressBar *pbar,
-						  GtkAdjustment  *adjustment);
-
 
 #ifdef __cplusplus
 }
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index b6f41d5dd..b80a4a04e 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -285,17 +285,6 @@ gtk_scrolled_window_new (GtkAdjustment *hadjustment,
 }
 
 void
-gtk_scrolled_window_construct (GtkScrolledWindow *scrolled_window,
-			       GtkAdjustment     *hadjustment,
-			       GtkAdjustment     *vadjustment)
-{
-  g_message ("gtk_scrolled_window_construct() is deprecated");
-  gtk_scrolled_window_set_hadjustment (scrolled_window, hadjustment);
-  gtk_scrolled_window_set_vadjustment (scrolled_window, vadjustment);
-  gtk_object_default_construct (GTK_OBJECT (scrolled_window));
-}
-
-void
 gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window,
 				     GtkAdjustment     *hadjustment)
 {
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index df7fa6539..352f76a52 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -80,10 +80,6 @@ void           gtk_scrolled_window_set_placement     (GtkScrolledWindow *scrolle
 void	       gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
 						      GtkWidget		*child);
 
-/* deprecated */
-void           gtk_scrolled_window_construct         (GtkScrolledWindow *scrolled_window,
-						      GtkAdjustment     *hadjustment,
-						      GtkAdjustment     *vadjustment);
 
 #ifdef __cplusplus
 }
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 0d9714540..1a134ad77 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1308,17 +1308,6 @@ gtk_spin_button_real_spin (GtkSpinButton *spin_button,
 
 
 void
-gtk_spin_button_construct (GtkSpinButton  *spin_button,
-			   GtkAdjustment  *adjustment,
-			   gfloat	    climb_rate,
-			   guint	    digits)
-{
-  g_message ("gtk_spin_button_construct() is deprecated");
-
-  gtk_spin_button_configure (spin_button, adjustment, climb_rate, digits);
-}
-
-void
 gtk_spin_button_configure (GtkSpinButton  *spin_button,
 			   GtkAdjustment  *adjustment,
 			   gfloat          climb_rate,
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 99a1b0929..83e613e50 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -143,11 +143,6 @@ void		gtk_spin_button_set_snap_to_ticks  (GtkSpinButton  *spin_button,
 						    gboolean	    snap_to_ticks);
 void            gtk_spin_button_update             (GtkSpinButton  *spin_button);
 
-/* deprecated */
-void		gtk_spin_button_construct	   (GtkSpinButton  *spin_button,
-						    GtkAdjustment  *adjustment,
-						    gfloat	    climb_rate,
-						    guint	    digits);
 
 
 #ifdef __cplusplus
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3812e1fe3..5bb11e08f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2484,22 +2484,6 @@ gtk_widget_unlock_accelerators (GtkWidget *widget)
 }
 
 void
-gtk_widget_thaw_accelerators (GtkWidget *widget)
-{
-  g_message ("gtk_widget_thaw_accelerators() is deprecated");
-
-  gtk_widget_unlock_accelerators (widget);
-}
-
-void
-gtk_widget_freeze_accelerators (GtkWidget *widget)
-{
-  g_message ("gtk_widget_freeze_accelerators() is deprecated");
-
-  gtk_widget_lock_accelerators (widget);
-}
-
-void
 gtk_widget_add_accelerator (GtkWidget           *widget,
 			    const gchar         *accel_signal,
 			    GtkAccelGroup       *accel_group,
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 3706d1801..c2f30d58e 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -610,10 +610,6 @@ void	     gtk_widget_class_path	   (GtkWidget *widget,
 #endif	/* GTK_TRACE_OBJECTS && __GNUC__ */
 
 
-/* deprecated */
-void       gtk_widget_freeze_accelerators (GtkWidget	       *widget);
-void	   gtk_widget_thaw_accelerators   (GtkWidget	       *widget);
-
 
 #ifdef __cplusplus
 }