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

[John Ralls <jralls src gnome org>]

commit 18edd2d86c2f75317f0a981ac7bb266684a9d8ed
Merge: 17c05a8 8f357bb
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jun 16 23:21:11 2011 -0700

    Merge branch 'master' into quartz-integration

 build/win32/vs10/gdk-win32.vcxproj |    4 ++--
 build/win32/vs10/gdk.vcxprojin     |    4 ++--
 build/win32/vs10/gtk-demo.vcxproj  |    4 ++--
 build/win32/vs10/gtk.vcxprojin     |    4 ++--
 build/win32/vs9/gdk-win32.vcproj   |    4 ++--
 build/win32/vs9/gdk.vcprojin       |    4 ++--
 build/win32/vs9/gtk-demo.vcproj    |    4 ++--
 build/win32/vs9/gtk.vcprojin       |    4 ++--
 gtk/gtkbindings.c                  |    1 -
 gtk/gtkbox.c                       |    9 +++++----
 gtk/gtkcolorsel.c                  |    1 -
 gtk/gtkfilechooser.c               |   36 ++++++++++++++++++------------------
 gtk/gtkfontsel.c                   |    1 -
 gtk/gtkimmodule.c                  |    1 -
 gtk/gtkinfobar.c                   |    7 +++++--
 gtk/gtkmain.c                      |    1 -
 gtk/gtksettings.c                  |    1 -
 gtk/gtkspinner.c                   |    1 -
 gtk/gtkswitch.c                    |    1 -
 gtk/gtkwidget.c                    |    1 -
 gtk/gtkwindow.c                    |    1 -
 gtk/queryimmodules.c               |    1 -
 22 files changed, 44 insertions(+), 51 deletions(-)
---