[gtk+/gtk-2-24-quartz: 4/4] Merge branch 'gtk-2-24' into gtk-2-24-quartz

[John Ralls <jralls src gnome org>]

commit 164d3be9c3ce0b9b38ca03e437aff2f0d5150260
Merge: 8e88bd2 ddd632d
Author: John Ralls <jralls ceridwen us>
Date:   Wed Mar 16 23:22:15 2011 -0700

    Merge branch 'gtk-2-24' into gtk-2-24-quartz

 build/win32/vs9/README.txt        |   14 +++++++++---
 gdk/gdk.c                         |    2 +-
 gdk/gdkdisplay.c                  |    2 +-
 gdk/gdkevents.c                   |    2 +-
 gdk/gdkrectangle.c                |    2 +-
 gdk/gdkwindow.c                   |   22 ++++++++++++--------
 gtk/gtkaboutdialog.c              |   18 ++++++++--------
 gtk/gtkalignment.c                |   12 +++++++---
 gtk/gtkbuildable.c                |    6 ++--
 gtk/gtkbuilder.c                  |    4 +-
 gtk/gtkbutton.c                   |    4 +-
 gtk/gtkcalendar.c                 |    9 +++++--
 gtk/gtkcellrenderer.c             |   20 +++++++++---------
 gtk/gtkcellview.c                 |    2 +-
 gtk/gtkclipboard.c                |    6 ++--
 gtk/gtkcolorsel.c                 |    7 +++--
 gtk/gtkdialog.c                   |    3 +-
 gtk/gtkeditable.c                 |    8 +++---
 gtk/gtkentry.c                    |    4 +-
 gtk/gtkframe.c                    |    6 +++-
 gtk/gtkhsv.c                      |   22 ++++++++++----------
 gtk/gtkicontheme.c                |   14 +++++++-----
 gtk/gtkiconview.c                 |    8 +++---
 gtk/gtkimcontext.c                |   24 +++++++++++-----------
 gtk/gtklabel.c                    |    8 +++---
 gtk/gtklayout.c                   |    6 +++-
 gtk/gtkmain.c                     |    9 ++++---
 gtk/gtkmisc.c                     |   10 +++++---
 gtk/gtkprintcontext.c             |    8 +++---
 gtk/gtkprinter.c                  |    8 +++---
 gtk/gtkprintsettings.c            |    9 ++++---
 gtk/gtkrange.c                    |    8 ++++--
 gtk/gtkrc.c                       |    9 +++++--
 gtk/gtkrecentchooser.c            |    5 ++-
 gtk/gtkscale.c                    |    4 +-
 gtk/gtkscalebutton.c              |    7 +++--
 gtk/gtkscrolledwindow.c           |    8 +++---
 gtk/gtkselection.c                |   19 +++++++++--------
 gtk/gtkspinbutton.c               |    8 +++---
 gtk/gtkstock.c                    |    6 ++--
 gtk/gtkstyle.c                    |    2 +-
 gtk/gtktestutils.c                |    6 +++-
 gtk/gtktextbufferrichtext.c       |   13 ++++++-----
 gtk/gtktextiter.c                 |    2 +-
 gtk/gtktextview.c                 |    2 +-
 gtk/gtktreednd.c                  |    7 +++--
 gtk/gtktreemodelfilter.c          |    2 +-
 gtk/gtktreeview.c                 |   39 +++++++++++++++++++------------------
 gtk/gtktreeviewcolumn.c           |    8 +++---
 modules/other/gail/gailcombobox.c |    8 +++++-
 50 files changed, 244 insertions(+), 198 deletions(-)
---