[gtk+/wip/gapplication-2-22: 24/25] Merge branch 'gtk-2-22' into wip/gapplication-2-22

[Colin Walters <walters src gnome org>]

commit 2ef3132399ebe32df581f2834078278b1118dc57
Merge: 06f01fa 3e16fd9
Author: Colin Walters <walters verbum org>
Date:   Fri May 28 09:16:57 2010 -0400

    Merge branch 'gtk-2-22' into wip/gapplication-2-22

 configure.in                                     |    2 +-
 docs/reference/gdk/tmpl/general.sgml             |    9 +-
 docs/reference/gtk/compiling.sgml                |    9 +
 docs/reference/gtk/x11.sgml                      |   54 ------
 gdk/gdk.symbols                                  |   45 ++++-
 gdk/gdkcolor.h                                   |    8 +-
 gdk/gdkcursor.h                                  |    4 +-
 gdk/gdkdisplay.h                                 |   34 ++--
 gdk/gdkdnd.c                                     |   73 ++++++++
 gdk/gdkdnd.h                                     |   28 ++--
 gdk/gdkgc.h                                      |   10 +-
 gdk/gdkimage.c                                   |  162 +++++++++++++++++
 gdk/gdkimage.h                                   |   35 +++--
 gdk/gdkinput.h                                   |   28 ++-
 gdk/gdkkeys.h                                    |    2 +-
 gdk/gdkpixmap.h                                  |    4 +-
 gdk/gdkscreen.h                                  |   12 +-
 gdk/gdkvisual.c                                  |  189 +++++++++++++++++++
 gdk/gdkvisual.h                                  |   52 ++++--
 gdk/gdkwindow.c                                  |  210 +++++++++++++++++++++-
 gdk/gdkwindow.h                                  |   79 +++++----
 gdk/quartz/gdkinput.c                            |   61 +++++++
 gdk/win32/gdkinput.c                             |   62 +++++++
 gdk/x11/gdkdisplay-x11.c                         |    4 +
 gdk/x11/gdkinput.c                               |  125 +++++++++++++
 gtk/gtk.symbols                                  |    1 +
 gtk/gtkbox.h                                     |   29 +++-
 gtk/gtkmenu.c                                    |  174 +++++++-----------
 gtk/gtkmenu.h                                    |    2 +-
 gtk/gtkpapersize.c                               |    9 +-
 gtk/gtktooltip.c                                 |   36 ++--
 gtk/gtktooltip.h                                 |    6 +
 gtk/gtktreemodel.c                               |    4 +-
 gtk/gtktreeselection.c                           |    2 +-
 gtk/gtktreeview.c                                |    4 +-
 gtk/gtkwidget.h                                  |    2 +
 gtk/gtkwindow.c                                  |   18 ++
 gtk/gtkwindow.h                                  |    1 +
 modules/printbackends/cups/gtkprintbackendcups.c |    6 +-
 39 files changed, 1270 insertions(+), 325 deletions(-)
---