+Fri May 18 14:25:20 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkcontainer.c: Remove reallocate-redraws property.
+ This is something that only a widget writer would ever want
+ to change.
+
+ * gtk/gtksignal.c: Handle G_SIGNAL_TYPE_STATIC_SCOPE for
+ gtk_signal_emit_by_name().
+
+ * gtk/gtkviewport.c: Fix some warnings.
+
+ * gtk/gtkwidget.c gtk/gtksizegroup.c: Add "size group" facility
+ allowing the requisitions of multiple widgets to be grouped
+ together.
+
+ * tests/testgtk.c: Add GtkSizeGroup test
+
+ * demos/gtk-demo/sizegroup.c: Add GtkSizeGroup demo.
+
+ * demos/gtk-demo/main.c demos/gtk-demo/pixbufs.c: Fix some
+ warnings.
+
+ * configure.in: Switch to using AM_GLIB_GNU_GETTEXT.
+
+2001-04-28 Martin Baulig <baulig@suse.de>
+
+ * gtk/gtkimagemenuitem.[ch]: Renamed gtk_image_menu_item_add_icon()
+ to gtk_image_menu_item_set_icon() and made it work if there's already
+ an image.
+ (gtk_image_menu_item_new): This function doesn't take any arguments anymore.
+ (gtk_image_menu_item_new_with_label): New function.
+
+Thu May 17 16:20:04 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * demos/gtk-demo/main.c (fontify): It's the worlds ugliest
+ highlighting code!!!! The result is okay so long as you don't try
+ to stress it. It also highlights a bug in the TextView so it's in
+ an unproportional font right now until it's fixed.
+
+ *demos/gtk-demo/*.c: Clean up code a bit to make it
+ ugly-parser(TM) friendly. (-:
+
+2001-05-17 Joe Shaw <joe@ximian.com>
+
+ * gtk/gtktextdisplay.c (gtk_text_layout_draw): Remove the assertions
+ that x_offset and y_offset must be >= 0. Clip the cursor being drawn
+ if it is only partially onscreen.
+
+Thu May 17 17:10:13 2001 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Make logical motion and deletion by graphemes,
+ not by characters.
+
+ * gtk/gtkentry.c: Handle "trailing" returns from Pango when they
+ are not zero or one; that is, when graphemes of multiple characters
+ are involved.
+
+ * gtk/gtktextlayout.c (line_display_index_to_iter): Remove unnecessary
+ FIXME.
+
2001-05-17 Alexander Larsson <alla@lysator.liu.se>
* gtk/gtkbbox.c:
* gdk/linux-fb/gdkwindow-fb.c (_gdk_windowing_window_clear_area):
Handle background pixmaps.
->>>>>>> 1.1955
Wed May 9 15:27:22 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_set_column_drag_function): New