[gtk+/quartz-integration: 825/825] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit a897d3ff4a57b06a4ee022e96a332ccc32ab1287
Merge: c59a8aa 3b90d87
Author: John Ralls <jralls ceridwen us>
Date:   Mon Dec 13 10:03:18 2010 -0800

    Merge branch 'master' into quartz-integration

 NEWS                                             |   42 ++
 configure.ac                                     |    4 +-
 docs/reference/gdk/gdk-docs.sgml                 |    1 +
 docs/reference/gtk/Makefile.am                   |    2 +-
 docs/reference/gtk/gtk3-sections.txt             |    6 +
 docs/reference/gtk/migrating-2to3.xml            |    3 +
 docs/reference/gtk/migrating-GtkStyleContext.xml |   82 ++-
 gdk/Makefile.am                                  |    3 +-
 gdk/gdk.symbols                                  |    2 +
 gdk/gdkdisplay.c                                 |   27 +-
 gdk/gdkdnd.c                                     |   37 +
 gdk/gdkdnd.h                                     |    2 +
 gdk/gdkinternals.h                               |    4 -
 gdk/gdkoffscreenwindow.c                         |    5 +-
 gdk/gdkpoly-generic.h                            |  291 --------
 gdk/gdkrgba.c                                    |   22 +-
 gdk/gdkrgba.h                                    |    2 +-
 gdk/gdkscreen.c                                  |    2 +-
 gdk/gdkwindow.c                                  |    9 +-
 gdk/gdkwindow.h                                  |    4 +-
 gdk/gdkwindowimpl.h                              |    3 +-
 gdk/quartz/GdkQuartzView.c                       |    8 +-
 gdk/quartz/GdkQuartzWindow.c                     |   40 +-
 gdk/quartz/Makefile.am                           |    2 -
 gdk/quartz/gdkdevice-core.c                      |   10 +-
 gdk/quartz/gdkdrawable-quartz.c                  |  232 -------
 gdk/quartz/gdkdrawable-quartz.h                  |   71 --
 gdk/quartz/gdkevents-quartz.c                    |   58 +--
 gdk/quartz/gdkgeometry-quartz.c                  |    3 +-
 gdk/quartz/gdkinput.c                            |   14 +-
 gdk/quartz/gdkprivate-quartz.h                   |    6 +-
 gdk/quartz/gdkwindow-quartz.c                    |  748 +++++++++++---------
 gdk/quartz/gdkwindow-quartz.h                    |   19 +-
 gdk/win32/gdkwindow-win32.c                      |    5 +-
 gdk/x11/gdkdnd-x11.c                             |    2 +-
 gdk/x11/gdkscreen-x11.c                          |    2 +-
 gdk/x11/gdkwindow-x11.c                          |    9 +-
 gdk/x11/gdkwindow-x11.h                          |    3 +
 gtk/Makefile.am                                  |    2 -
 gtk/gtk.symbols                                  |    4 -
 gtk/gtkappchooseronline.c                        |    1 -
 gtk/gtkappchooserwidget.c                        |    4 +-
 gtk/gtkbuilder.c                                 |    2 +-
 gtk/gtkcalendar.c                                |   10 +-
 gtk/gtkcellrendererpixbuf.c                      |    7 +-
 gtk/gtkcolorbutton.c                             |    4 +-
 gtk/gtkcontainer.c                               |   33 +-
 gtk/gtkcssprovider.c                             |  115 ++--
 gtk/gtkdnd.c                                     |   78 +--
 gtk/gtkentry.c                                   |   34 +-
 gtk/gtkfilechooserdefault.c                      |   12 +-
 gtk/gtkiconfactory.c                             |    8 +-
 gtk/gtkiconview.c                                |    8 +-
 gtk/gtkimage.c                                   |   28 +-
 gtk/gtklabel.c                                   |   12 +-
 gtk/gtkprintunixdialog.c                         |    1 +
 gtk/gtksearchenginetracker.c                     |  571 ++++++++--------
 gtk/gtksizerequest.c                             |   24 +-
 gtk/gtkstatusicon.c                              |   14 +-
 gtk/gtkstyle.c                                   |  303 --------
 gtk/gtktextview.c                                |    8 +-
 gtk/gtkthemingengine.c                           |   11 +-
 gtk/gtktrayicon-x11.c                            |   11 +-
 gtk/gtktreeview.c                                |    6 +-
 gtk/gtkwidget.c                                  |   47 ++-
 gtk/gtkwidget.h                                  |   10 +-
 gtk/gtkwidgetpath.h                              |    4 +-
 gtk/gtkwindow-decorate.c                         |  808 ----------------------
 gtk/gtkwindow-decorate.h                         |   41 --
 gtk/gtkwindow.c                                  |   18 +-
 gtk/tests/Makefile.am                            |    1 +
 gtk/tests/stylecontext.c                         |   20 +-
 modules/engines/Makefile.am                      |    6 +-
 po-properties/POTFILES.in                        |    1 -
 po/POTFILES.in                                   |    1 -
 po/nb.po                                         |  169 +++--
 76 files changed, 1344 insertions(+), 2878 deletions(-)
---