]> Pileus Git - ~andy/gtk/blobdiff - ChangeLog
don't use += before =
[~andy/gtk] / ChangeLog
index 59fed525e169461013e19656c20e292aa759c172..6914fef55412d7487f4af29be7762aafbd2659d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,511 @@
+2001-09-18  Matt Wilson  <msw@redhat.com>
+
+       * docs/Makefile.am (EXTRA_DIST): don't use += before =
+
+       * docs/faq/Makefile.am (EXTRA_DIST): likewise
+
+       * docs/tutorial/Makefile.am (EXTRA_DIST): likewise
+       
+       * gdk/Makefile.am (MAINTAINERCLEANFILES): likewise
+       (EXTRA_HEADERS): likewise
+
+       * gtk/Makefile.am (MAINTAINERCLEANFILES): likewise
+       (EXTRA_HEADERS): likewise
+       (EXTRA_DIST): likewise
+       (CLEANFILES): likewise
+
+       * gtk/stock-icons/Makefile.am (CLEANFILES): likewise
+
+       * tests/Makefile.am (EXTRA_DIST): likewise
+       
+       * Makefile.am (install-data-local): changed to use
+       install-data-hook, which runs after install-pkgconfigDATA, so that
+       the pkgconfigdir will have been created and populated first.
+
+Mon Sep 17 17:39:52 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcelleditable.[ch]: Add editable interface.  This should
+       be the last big GtkTreeView API change.
+
+       * gtk/gtkcellrenderer.[ch]: Get rid of the "event" vfunc, and
+       replace with "activate" and "start_editing".  Also, added a
+       "can_activate" and "can_edit" property.
+
+       * gtk/gtktreeviewcolumn.c: modify to use above.
+
+2001-09-16  Alexander Larsson  <alla@lysator.liu.se>
+
+       * gtk/gtkoptionmenu.c:  Handle scroll wheel events.
+
+Fri Sep 14 22:31:25 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/gtk-demo/main.c (setup_default_icon): Use a shaped
+       icon instead of one with ugly white background.
+
+Fri Sep 14 22:26:01 2001  Matthias Clasen  <matthiasc@poet.de>
+
+       * demos/gtk-demo/stock_browser.c (id_to_macro): make
+       the uppercasing work. (#59550)
+
+2001-09-14  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog_error.png:
+       * gtk/stock-icons/dialog_question.png: more road signs
+
+2001-09-13  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog_question.png:
+       * gtk/stock-icons/dialog_warning.png: anders and jonathan seem to
+         like a road sign.
+
+Wed Sep 12 19:01:05 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
+       signals to make them more clear.  Also, change ::range_changed to
+       ::row_changed.
+       * gtk/gtktreemodel.c: Adjust to interface change
+       * gtk/gtktreemodel.h: ditto
+       * gtk/gtktreemodelsort.c: ditto
+       * gtk/gtktreestore.c: ditto
+       * gtk/gtkliststore.c: ditto
+       * gtk/gtktreeview.c: ditto
+       * tests/testtreecolumns.c: ditto
+       * gtk/gtkmarshal.list: Actually remove a marshaller!
+
+2001-09-12  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtktextview.c
+       Add support for Ctrl+Up/Down arrow to move cursor to beginning
+       of previous/next paragraph. If within a paragraph cursor moves to
+       beginning of that paragraph.
+
+2001-09-12  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog_question.png: replacing the shaky
+         question mark with a sans-serif one.
+       * gtk/stock-icons/stock_top.png, stock_bottom.png,
+     stock_first.png, stock_last.png: using the new style arrows
+       * gtk/stock-icons/stock_font.png: simple one to replace the ugly
+     colors.
+       * gtk/stock-icons/stock_refresh.png: anti-aliased and changed
+     color.
+       * gtk/stock-icons/stock_zoom*: anti-aliased
+       * gtk/stock-icons/dialog_error.png, dialog_warning.png: confused
+     '-' with a '_', removed the wrong files
+
+Sat Sep  8 16:19:02 2001  Owen Taylor  <otaylor@redhat.com>
+       * gtk/gtkmain.c: Implement a search path for GTK+ modules.
+       * configure.in gtk/gtkrc.c gtk/Makefile.am: Look for modules
+       in gtk-2.0/<type>/major.minor.(micro-binary_age) rather
+       than in gtk-2.0/major.minor.micro/<type>/. This
+       works better for a search path for modules.
+       * gtk+-2.0.pc.in gtk+-2.0-uninstalled.pc.in: Add
+       gtk_binary_version variable holding major.minor.(micro-binary_age).
+       * modules/input/Makefile.am (moduledir): Fix installation
+       directory to match change in lookup location.
+       * gtk/gtkmain.c (gtk_init_check): Remove OS/2 code for dll 
+       suffixes. Needs to be handled in g_module_build_path().
+
+       * gtk/gtkrc.c gtk/queryimmodules.c: Use g_build_filename() where
+       appropriate.
+Tue Sep 11 13:59:12 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (insert_rc_property): Fixed reversed comparison
+       causing RC properties not to work.
+
+2001-09-11  Jakub Steiner <jimmac@ximian.com>
+
+       * gtk/stock-icons/dialog-error.png: less drastic
+       * gtk/stock-icons/dialog-warning.png: no body parts. (I hope
+         "STOP" is international enough.
+       * gtk/stock-icons/stock_dnd*.png: get rid of the cursor
+       * gtk/stock-icons/stock_menu_properties.png: 16x16 version
+
+Mon Sep 10 21:26:24 2001  Joshua N Pritikin  <vishnu@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_set_buffer): Make
+       (add|remove)_selection_clipboard symmetric. (bug #59836)
+
+       * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): 
+       Avoid SEGV for empty tree. (bug #60243)
+
+Mon Sep 10 20:47:22 2001  Tim Janik  <timj@gtk.org>
+
+       * tests/testgtk.c (create_idle_test): slight fix for
+       g_object_set() not usable for nesting anymore.
+
+       * gtk/gtkhandlebox.c (gtk_handle_box_class_init): 
+       * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow
+       properties, supply ::shadow_type properties instead as most
+       other widgets do.
+
+2001-09-10  Alex Larsson  <alexl@redhat.com>
+
+       * demos/gtk-demo/stock_browser.c:
+       * gdk/gdkcolor.c:
+       * gdk/gdkfont.c:
+       * gdk/gdkcursor.c:
+       * gdk/gdkevents.c:
+       * gdk/gdkrectangle.c:
+       * gtk/gtktypeutils.c:
+       Update to use the new g_boxed_type_register_static API.
+
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtktreestore.c:
+       Fix looping in gtk_tree_store_init() waiting for zero random int.
+
+Mon Sep 10 16:55:49 2001  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkalignment.c (gtk_alignment_init): fix xscale and yscale
+       behaviour which havoc broke. they have to default to 1.0 for
+       expand behaviour.
+
+       * gtk/gtkwindow.c (gtk_window_get_property): don't cast NULL objects.
+
+2001-09-10  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value)
+       Amend previous change to avoid runtime error in g_param_spec_ref()
+
+Mon Sep 10 06:58:56 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (insert_rc_property): Fix blank line
+       in the wrong place.
+
+Mon Sep 10 06:50:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkstyle.c (_gtk_style_peek_property_value): Don't
+       do a lookup immediately after creating style->property_cache,
+       since bsearch crashes on zero length for Solaris.
+       (Found by Padraig O'Briain.)
+
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * gtk/gtkwidget.c (_gtk_widget_peek_colormap):
+       Really return NULL if not set.
+       (gtk_widget_init): Remove unused varaible.
+       
+2001-09-09  Alexander Larsson  <alla@lysator.liu.se> 
+
+       * configure.in:
+       Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer
+       in cvs.
+
+2001-09-08  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtkaccelgroup.c: add docs to functions that I can imagine 
+       people might want to use
+
+2001-09-08  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtkalignment.c (gtk_alignment_class_init): default
+       xscale/yscale to 0.0, not 0.5, 0.5 isn't useful
+
+       * tests/testtextbuffer.c: fix usage of gtk_text_iter_spew
+
+       * gtk/gtktextiter.c: fix docs
+       (gtk_text_iter_spew): get rid of this
+
+       * gtk/gtklayout.c: docs
+
+       * gtk/gtkbutton.c (gtk_button_construct_child): add an alignment
+       to center image and label together, instead of having image on
+       left and label centered, patch/suggestion from Jacob
+
+       * gtk/gtkdialog.c: docs
+
+Sat Sep  8 14:19:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c: Write documentation
+       * gtk/gtktreestore.c: Write documentation
+
+Sat Sep  8 13:53:09 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.[ch] gtk/gtkstyle.[ch]: Replace uses of GBSearchArray
+       with GArray and bsearch(), to remove dependency on a still
+       evolving interface that we want to keep private to glib/gobject. 
+
+2001-09-08  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_add_attribute):
+       docs fixes
+
+       * gtk/gtktable.c (gtk_table_get_col_spacing): docs fixes
+
+       * gtk/gtkspinbutton.c (gtk_spin_button_get_increments): docs fixes
+
+       * gtk/gtksocket.c (gtk_socket_steal): docs fixes
+
+       * gtk/gtkscrolledwindow.h: docs fixes
+
+       * gtk/gtkimage.c (gtk_image_new): docs fixes
+
+Sat Sep  8 01:49:22 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkmain-x11.c (_gdk_windowing_init_check): Prevent a 
+       false alarm  constness warning with a cast.
+
+       * gdk/x11/gdkx.h: Undefine GDK_ROOT_PARENT before redefining it
+       for the inside-gdk case.
+
+Sat Sep  8 01:44:18 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_set_dirty):
+       remove g_print.
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): unref model when we
+       change models, #59899
+
+2001-09-07  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtkmain.c: move some docs inline
+
+2001-09-07  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtk.h: tsk tsk, jrb broke the build
+
+Fri Sep  7 20:45:29 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_pack_{start,end}):
+       Removed 'fill' attribute.  It was silly b/c that was a property of
+       the cell renderer, anyway.
+       (gtk_tree_view_column_render): Actually render the packed
+       renderers.
+       * doc/tree-column-sizing.txt: initial devel documentation.
+       * gtk/gtktreeview.c (gtk_tree_view_expand_all): Fix bug.
+       * gtk/gtkcellrenderertextpixbuf.[ch]: removed.
+
+       * tests/testtreefocus.c: fix up to reflect above changes.
+       * tests/testtreeview.c: ditto
+       * demos/gtk-demo/stock_browser.c: ditto
+
+2001-09-07  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c:
+       Removed unused function.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c
+       * gdk/linux-fb/gdkfont-fb.c:
+       Use PangoLanguage functions.
+
+       * gdk/linux-fb/gdkinput.c:
+       * gdk/linux-fb/gdkselection-fb.c:
+       Fix const warnings.
+       
+       * gdk/linux-fb/gdkwindow-fb.c:
+       Fix warning. Implement gdk_window_set_icon_list() and
+       gdk_window_get_frame_extents(). (No icon support yet though.)
+
+       * gtk/gtkwindow.c (gtk_window_get_position):
+       If window->frame is set get the extents of it instead.
+       
+Fri Sep  7 18:50:59 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_get_default_colormap): 
+       Make the default default colormap the GdkRGB colormap,
+       not the system colormap.
+
+       * gtk/gtkinvisible.c (gtk_invisible_init) 
+         gtk/gtkwindow.c (gtk_window_init): Set the current
+       colormap, as returned by _gtk_widget_peek_colormap()
+       on the widget.
+
+       * gtk/gtkwidget.[ch]: Export _gtk_widget_peek_colormap
+       to GTK+. Make it return %NULL instead of the default
+       colormap if no colormap has explicitely been pushed.
+
+       * gtk/gtkwidget.c (gtk_widget_get_colormap): Check for
+       colormaps on ancestral widgets before defaulting the
+       the system default colormap.
+
+       * docs/Changes-2.0.txt: explain colormap changes.
+
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextiter.c: add some lame code to handle G_MININT, fixes 
+       #57424
+
+Fri Sep  7 18:17:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.h gdk/x11/gdkmain-x11.c: Deprecate gdk_set/get_use_xshm, 
+       make gdk_set_use_xshm a noop. Remove --no-xshm command line
+       option. If we aren't autodetecting properly, we need
+       to fix the problem, or at least make it an environment
+       variable setting, to avoid problems with propagating
+       to embedded children, plugins, etc.
+
+       * gdk/gdkcolor.h: Deprecate gdk_colormap_get_system_size().
+
+       * gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h
+       (gdk_pixbuf_render_pixmap_and_mask_for_colormap):
+       New function to render a pixmap and mask for a particular colormap.
+
+       * gtk/gtkwindow.c (get_pixmap_and_mask): Change to use
+       gdk_pixbuf_render_pixmap_and_mask_for_colormap () instead
+       of internal implementation of the same.
+
+2001-09-07  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_get_lines): remove some
+       debug code that seems to have caused a breakpoint in valid cases
+       
+       * gtk/gtktextbtree.c (_gtk_text_btree_add_view): set the prev
+       pointer on the first view when adding the second view, fixes
+       crash when closing gtk-demo text test with active selection
+
+       * gtk/gtktextbuffer.c
+       (gtk_text_buffer_remove_selection_clipboard): don't leave dead
+       clipboards in the list of clipboards - probably fixes #59836
+
+Fri Sep  7 11:51:44 2001  Owen Taylor  <otaylor@redhat.com>
+
+      Make gdkx.h the only installed header from gdk/x11.
+      All structures in gdk/x11 are opaque.
+
+       * gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
+       Don't install gdk{drawable,pixmap,window}-x11.h.
+
+       * gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c: 
+       Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11, 
+       GdkVisualClass into C files.
+
+       * gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.
+
+       * gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
+       gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
+       Add public functions to replace previously exported direct
+       structure access.
+       gdk_x11_colormap_get_{xdisplay,xcolormap} 
+       gdk_x11_cursor_get_{xdisplay,xcursor},
+       gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual, 
+       gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
+       gdk_x11_gc_get_{xdisplay,ximage}
+       
+       * gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
+       GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.
+
+      Fix a number of variables and functions that were exported
+      "accidentally" from GDK.
+
+       * gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
+       gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit, 
+       gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data,
+       gdk_event_notify, gdk_queued_events, gdk_queued_tail,
+       gdk_event_new, gdk_events_queue, gdk_events_unqueue,
+       gdk_event_queue_find_first, gdk_event_queue_remove_link,
+       gdk_event_queue_append, gdk_event_button_generate,
+       gdk_debug_flags, gdk_default_filters, gdk_parent_root.
+
+       * gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c, 
+          gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
+       gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks, 
+       gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
+       gdk_use_xshm, gdk_input_ignore_core.
+
+       * gdk/x11/xsettings-common.h (xsettings_list_insert): Add
+       #defines to namespace functions into the private _gdk_ 
+       namespace.
+
+       * gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
+       to replace gdk_parent_root exported variable. Adjust and
+       deprecate GDK_ROOT_PARENT().
+
+       * demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
+       GDK_ROOT_PARENT usage, remove includes of port-specific
+       headers.
+
+       * gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for 
+       _gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core, 
+       gdk_input_devices, _gdk_input_windows, gdk_init_input_core.
+
+       * gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
+       docs/Changes-2.0.txt: Remove gdk_wm_protocols, 
+       gdk_wm_delete_window functions, gdk_wm_take_focus, 
+       use gdk_atom_intern() instead.
+
+       * gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
+         gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h} 
+         gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
+         gtk/gtkselection.c 
+        Unexport gdk_selection_property, just use 
+       gdk_atom_intern ("GDK_SELECTION").
+
+       * gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}: 
+       Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type, 
+       GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate, 
+       GdkVisualprivate, gdk_x11_gc_flush.
+
+      Make a number of public exports of variables into functions
+      to increase encapsulation.
+
+       * gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h 
+       gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer, 
+       move to gdkinternals.h. Add gdk_device_get_core_pointer ().     
+
+       * gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
+       docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code, 
+       gdk_error_warnings.
+
+       * gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
+         docs/Changes-2.0.txt: 
+       s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
+       s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
+       Add gdk_x11_get_default_xdisplay().
+
+       * gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c 
+       win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c 
+       gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class, 
+       Don't export gdk_progclass, move --class command line
+       option and handling to common portion of GDK.
+
+      Miscellaneous fixes:
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
+       g_return_val_if_fail that should have been g_return_if_fail.
+
+       * gdk/gdkinternals.h gdk/gdkprivate.h: Move
+       gdk_synthesize_window_state() to the semi-public gdkprivate.h.
+
+       * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
+       X11 dependency.
+
+       * gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO: 
+       Remove unused gdk_key_repeat_disable/restore.
+
+       * linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c 
+       x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
+       Remove unused gdk_null_window_warnings variable.
+
+       * gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
+       it can be retrieved from the repository; it is too far
+       from functional to be worth having people check out;
+       it would be easier to start from scratch, I suspect.
+
+       * gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().
+
+       * gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c 
+       gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c: 
+       Fix some accidentally global variables and unused global variables.
+
+       * gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c 
+       gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c: 
+       Fix some accidentally global variables and unused global variables.
+
+      Add some space for future expansion to multihead.
+
+       * gdk/gdkdrawable.h: Add four reserved function pointers
+       for future expansion of GdkDrawableClass.
+
+       * gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
+       where we can put a GdkScreen * later.
+
 2001-09-07  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_flush_scroll): update
@@ -657,6 +1165,7 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
+>>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating