Update to 2.2.0.

Subjective extract of changes:
* Only close dialogs on Escape if they have a cancel button. [James Willcox]
* Add Home/End/Page_Up/Page_Down keybindings for menus [Owen,
  Narayana Pattipati, Marius Andreiana]
* Improved default color scheme [Soeren Sandmann, with advise from
  Tuomas Kuosmanen and Garrett LeSage]
* Make pixmap creation functions take a GdkDrawable not a GdkWindow
  [Kristian Rietveld]
* Support move-resize emulation for all edges. [Matthias Clasen]
* Remove extra selections for ButtonRelease in XInput code
  [Garry Osgood, Owen]
* Support RTL flipping for statusbars [Matthias]
* Use octal escapes rather than literal UTF-8 in strings [Owen]
* Make a lot of read-only data const. [Matthias, Morten Welinder]
* Use g_get_application_name() for default window titles and
  for the title of the client leader window [Owen, Havoc Pennington]
* Complete resize-grippy support, move-resize emulation
  [Anders Carlsson, Matthias Clasen]
* On screen change, recreate the widget's Pango context [Owen]
* Make g_object_set (gtk_settings_get_default (), ...) to override
  settings from XSETTINGS and ~/.gtkrc [Jonathan Blandford]
* Make GtkInputDialog multihead aware [Owen]
* Add a ::screen-changed signal to GtkWidget [Owen Taylor]
* Draw/check menu items insensitive [Soeren, Tim Evans]
* Add ::snap-edge-set-property to GtkHandleBox [Owen, Matthias]
* RTL flipping improvements for GtkHandleBox, GtkMenuItem, GtkOptionMenu,
  GtkCheckMenuItem [Matthias Clasen]
* Handle painting text on dark-colored progressbars [Soeren]
* Sort the input method list in the right click popup [Abigail Brady]
* Don't grab the focus to the default button in a GtkDialog [Daniel Elstner]
* Remove usage of XLookupString outside of GtkIMContextXIM [Owen]
* Handle Shift/Caps/Num_Lock properly for non-Xkb [Owen]
* Add a --screen option to set default screen [Balamurali Viswanathan, Owen]
* Add simple support for startup notification [Havoc Pennington]
* Handle focus indication for check and radio buttons without children
  [Dave Camp, Owen]
* Much work on improve submenu navigation [Soeren Sandmann]
* Add "selected_shadow_type" property for menus [Soeren]
* Add "scrollbar_spacing" style property [Anders Carlsson, Owen]
* Rework GtkPaned keynav [Soeren, Calum Benson]
* Sensitivity and keynav fixes for GtkFileSelection [Muktha Narayan, Owen]
* Removed mnemonics for GtkToolbar Items [Mikael Hallendal]
* Allow themes to set GtkTreeView even/odd row colors [Kristian]
* Add support for separately installed Pixbuf loaders [Matthias Clasen]
* Export gdk_event_new(), discourage stack allocated events [Owen]
* gdk_draw_pixbuf() as better name for gdk_pixbuf_render_to_drawable() [Owen]
* Basic support for RandR extension [Keith Packard, Owen]
* Allow moving paned sliders all the way to the edge [Owen, Darin Adler]
* Add tag_table construct property to GtkTextBuffer [Daniel Elstner]
* gtk_window_set_[default_]icon_from_file [Owen, Havoc]
* Multihead support
* Add GdkDisplay, GdkScreen structures
* Add _for_display(), _for_screen() variants where needed in GDK and GTK+
  (In other cases, make the variants methods on GdkDisplay/GdkScreen
* Adapt GTK+ widgets to be multihead safe
* Allow initialization of GTK+ without opening a display with gtk_parse_args()
* Add multihead support to demos/tests.
* Xinerama support [Erwann Chenede, Matthias Clasen]
* Allow GDK backends to add custom argument parsing [Sven Neumann]
* Add ::keys-changed signal to GdkKeymap, handle keymap changes for keybindings [Owen]
* Add style property for drawing menu items without shadow [Soeren]
* gtk_widget_modify_color_component/font(): Allow clearing
  current modifications. [Owen]
* Add GtkWidget::is_focus, GtkWindow::is_active properties [Owen]
* Some XEMBED changes for standards compliance and Qt compatibility [Owen]
* Improve label behavior when it gets a too small allocation [Soeren]
* Add support for depth 8 StaticColor visuals to gdkrgb [Matthias]
* Theme drawing improvements [Soeren]
* Add types for GtkRowReference, GtkClipboard [Jonathan Blandford, James Henstridge, Owen]
* Use G_TYPE_FLAG_ABSTRACT for abstract types [Matthias]
* Add gtk_menu_shell_select_first() [Owen]
* Add gtk_notebook_get_n_pages() [Havoc Pennington]
* Allow accel_path = NULL for gtk_menu_item_set_accel_path().
* Allow icon sizes to be changed via a GtkSetting [Bill Haneman, Brian Cameron, Owen]
* Improve gdk-pixbuf loader tests [Soeren Sandmann]
* Use iTXT chunks when necessary in PNG image saver [Matthias]
* Add incremental loading for progressive jpegs [Matthias]
* Add load-at-size functionality [Matthias]
* Add a loader for .ANI animations [Matthias]
* Load hotspot for .ICO files [Matthias]
* Add gtk-im-preedit-style/gtk-im-status-style XSETTINGS [Hidetoshi Tajima]

Lots of bug fixes and enhancements.

9 files changed, 28 insertions, 68 deletions

diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 18b6ad8498e..04229a1e29f 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2002/12/24 04:07:33 wiz Exp $
 
---- configure.orig	Wed Jul 31 14:12:14 2002
+--- configure.orig	Fri Dec 20 21:55:05 2002
 +++ configure
-@@ -10391,7 +10391,7 @@ LIBS="$LIBS $INTLLIBS"
- 
- # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
- # this is the directory where the *.{mo,gmo} files are installed
--gtklocaledir='${prefix}/${DATADIRNAME}/locale'
-+gtklocaledir='${prefix}/${PKGLOCALEDIR}/locale'
- 
- 
- echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
-@@ -14347,11 +14347,11 @@ echo "$as_me: error: Could not find a gd
+@@ -12939,11 +12939,11 @@ echo "$as_me: error: Could not find a gd
    fi
  fi
  
@@ -25,7 +16,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
  
  
  
-@@ -16861,7 +16861,7 @@ fi
+@@ -15635,7 +15635,7 @@ fi
  
  GDK_PIXBUF_XLIB_PACKAGES=
  GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
@@ -34,7 +25,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
  
  
  
-@@ -17077,7 +17077,7 @@ LDFLAGS="$saved_ldflags"
+@@ -15831,7 +15831,7 @@ LDFLAGS="$saved_ldflags"
  
  GDK_PACKAGES=$PANGO_PACKAGES
  GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
@@ -43,7 +34,7 @@ $NetBSD: patch-aa,v 1.6 2002/10/08 00:02:18 jlam Exp $
  
  #
  # If we aren't writing explicit dependencies, then don't put the extra libraries we need
-@@ -17195,7 +17195,7 @@ GTK_PACKAGES=atk
+@@ -15929,7 +15929,7 @@ GTK_PACKAGES=atk
  GTK_EXTRA_LIBS=
  GTK_EXTRA_CFLAGS=
  GTK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
index db6857b8cdd..84b6b0500c2 100644
--- a/x11/gtk2/patches/patch-ab
+++ b/x11/gtk2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2002/10/08 00:02:18 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2002/12/24 04:07:33 wiz Exp $
 
---- demos/Makefile.am.orig	Mon Jul 29 20:09:49 2002
+--- demos/Makefile.am.orig	Sat Nov  9 01:07:21 2002
 +++ demos/Makefile.am
 @@ -19,6 +19,7 @@ DEPS = \
  	$(top_builddir)/gtk/@gtktargetlib@
@@ -10,12 +10,3 @@ $NetBSD: patch-ab,v 1.5 2002/10/08 00:02:18 jlam Exp $
  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
  	$(top_builddir)/gdk/@gdktargetlib@        			\
  	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@@ -35,7 +36,7 @@ noinst_PROGRAMS = 		\
- if CROSS_COMPILING
- pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
- else
--pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
-+pixbuf_csource=GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf $$topdir/gdk-pixbuf/gdk-pixbuf-csource
- endif
- 
- test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index 5ea3ef295d6..d4b38eb8c80 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2002/10/08 00:02:18 jlam Exp $
+$NetBSD: patch-ac,v 1.8 2002/12/24 04:07:34 wiz Exp $
 
---- demos/Makefile.in.orig	Wed Jul 31 15:10:15 2002
+--- demos/Makefile.in.orig	Sat Dec 21 02:35:04 2002
 +++ demos/Makefile.in
-@@ -195,6 +195,7 @@ DEPS = \
+@@ -188,6 +188,7 @@ DEPS = \
  
  
  LDADDS = @STRIP_BEGIN@ 							\
@@ -10,12 +10,3 @@ $NetBSD: patch-ac,v 1.7 2002/10/08 00:02:18 jlam Exp $
  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
  	$(top_builddir)/gdk/@gdktargetlib@        			\
  	$(top_builddir)/gtk/@gtktargetlib@ 				\
-@@ -210,7 +211,7 @@ noinst_PROGRAMS = \
- 	pixbuf-demo
- 
- @CROSS_COMPILING_TRUE@pixbuf_csource = @CROSS_COMPILING_TRUE@$(GDK_PIXBUF_CSOURCE)
--@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/gdk-pixbuf-csource
-+@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf $$topdir/gdk-pixbuf/gdk-pixbuf-csource
- 
- testpixbuf_DEPENDENCIES = $(DEPS)
- testpixbuf_drawable_DEPENDENCIES = $(DEPS)
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
index 40bef60588a..122a163c753 100644
--- a/x11/gtk2/patches/patch-ad
+++ b/x11/gtk2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.5 2002/12/24 04:07:34 wiz Exp $
 
---- demos/gtk-demo/Makefile.am.orig	Fri Mar  8 01:36:21 2002
+--- demos/gtk-demo/Makefile.am.orig	Sun Sep 29 23:43:06 2002
 +++ demos/gtk-demo/Makefile.am
-@@ -41,6 +41,7 @@
+@@ -42,6 +42,7 @@ DEPS = \
  	$(top_builddir)/gtk/@gtktargetlib@
  
  LDADDS = @STRIP_BEGIN@ 							\
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index afa7a0b00fa..97390d88bd4 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2002/08/25 19:23:32 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2002/12/24 04:07:34 wiz Exp $
 
---- demos/gtk-demo/Makefile.in.orig	Sun Jun 16 01:16:32 2002
+--- demos/gtk-demo/Makefile.in.orig	Sat Dec 21 02:35:05 2002
 +++ demos/gtk-demo/Makefile.in
-@@ -216,6 +216,7 @@
+@@ -210,6 +210,7 @@ DEPS = \
  
  
  LDADDS = @STRIP_BEGIN@ 							\
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
index 99bb92ecd64..b56b81a32fd 100644
--- a/x11/gtk2/patches/patch-ag
+++ b/x11/gtk2/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.4 2002/12/24 04:07:34 wiz Exp $
 
---- gdk-pixbuf/Makefile.am.orig	Fri Mar  8 01:36:26 2002
+--- gdk-pixbuf/Makefile.am.orig	Sat Dec  7 16:13:58 2002
 +++ gdk-pixbuf/Makefile.am
-@@ -227,7 +227,7 @@
+@@ -255,7 +255,7 @@ INCLUDES = @STRIP_BEGIN@ 			\
  @STRIP_END@
  
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
 -LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
 +LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
  
- noinst_PROGRAMS = test-gdk-pixbuf test-loaders
+ noinst_PROGRAMS = test-gdk-pixbuf
  test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
index c1aa38a8921..6619bc00a50 100644
--- a/x11/gtk2/patches/patch-ah
+++ b/x11/gtk2/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.4 2002/12/24 04:07:34 wiz Exp $
 
---- gdk-pixbuf/Makefile.in.orig	Tue Apr  2 06:50:29 2002
+--- gdk-pixbuf/Makefile.in.orig	Sat Dec 21 02:34:56 2002
 +++ gdk-pixbuf/Makefile.in
-@@ -324,7 +324,7 @@
+@@ -383,7 +383,7 @@ INCLUDES = @STRIP_BEGIN@ 			\
  
  
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
 -LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
 +LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
  
- noinst_PROGRAMS = test-gdk-pixbuf test-loaders
+ noinst_PROGRAMS = test-gdk-pixbuf
  test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-am b/x11/gtk2/patches/patch-am
deleted file mode 100644
index 0aaa95e9dc4..00000000000
--- a/x11/gtk2/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.3 2002/04/06 15:48:56 dmcmahill Exp $
-
---- po/Makefile.in.in.orig	Thu Sep 27 06:07:57 2001
-+++ po/Makefile.in.in
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/${PKGLOCALEDIR}/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/x11/gtk2/patches/patch-aq b/x11/gtk2/patches/patch-aq
index d389fffd515..6f291edfc6a 100644
--- a/x11/gtk2/patches/patch-aq
+++ b/x11/gtk2/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1 2002/10/08 00:02:19 jlam Exp $
+$NetBSD: patch-aq,v 1.2 2002/12/24 04:07:35 wiz Exp $
 
---- Makefile.in.orig	Mon Oct  7 15:50:30 2002
+--- Makefile.in.orig	Sat Dec 21 02:34:37 2002
 +++ Makefile.in
-@@ -174,7 +174,7 @@ l = @l@
+@@ -167,7 +167,7 @@ gtktargetlib = @gtktargetlib@
  ms_librarian = @ms_librarian@
  xinput_progs = @xinput_progs@