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

[John Ralls <jralls src gnome org>]

commit 44edca28410a160f54d72d29ae808a144da0c2a3
Merge: 958e401 187f91e
Author: John Ralls <jralls ceridwen us>
Date:   Tue Apr 26 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 build/win32/Makefile.am                    |    3 +-
 build/win32/vs10/Makefile.am               |   19 +
 build/win32/vs10/README.txt                |   77 ++++
 build/win32/vs10/gdk-win32.vcxproj         |  141 ++++++
 build/win32/vs10/gdk-win32.vcxproj.filters |   79 ++++
 build/win32/vs10/gdk.vcxproj.filtersin     |   29 ++
 build/win32/vs10/gdk.vcxprojin             |  192 +++++++++
 build/win32/vs10/gtk+.props                |  640 ++++++++++++++++++++++++++++
 build/win32/vs10/gtk+.sln                  |   65 +++
 build/win32/vs10/gtk-demo.vcxproj          |  220 ++++++++++
 build/win32/vs10/gtk-demo.vcxproj.filters  |  132 ++++++
 build/win32/vs10/gtk.vcxproj.filtersin     |   43 ++
 build/win32/vs10/gtk.vcxprojin             |  206 +++++++++
 build/win32/vs10/install.vcxproj           |  113 +++++
 build/win32/vs9/README.txt                 |    7 +-
 configure.ac                               |    1 +
 gdk/Makefile.am                            |   22 +-
 gtk/Makefile.am                            |   22 +-
 gtk/gtkcombobox.c                          |   44 ++-
 gtk/gtkcombobox.h                          |    2 +-
 gtk/gtkcssprovider.h                       |    2 +-
 gtk/gtkentry.c                             |   25 +-
 gtk/gtkgrid.c                              |   18 +-
 gtk/gtklabel.c                             |    5 +-
 gtk/gtktextview.c                          |    2 +
 gtk/gtktooltip.c                           |   62 ++--
 gtk/gtkwidget.c                            |   16 +
 gtk/gtkwindow.c                            |  133 ++++--
 28 files changed, 2208 insertions(+), 112 deletions(-)
---