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

[John Ralls <jralls src gnome org>]

commit d2fda4c5181f056bc967c038f5b3614fbfa15f51
Merge: bed32a2 77c102a
Author: John Ralls <jralls ceridwen us>
Date:   Wed Jun 8 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/gdkwindow.c                                |    8 +-
 gtk/Makefile.am                                |    4 +-
 gtk/gtk9slice.c                                |  375 ----
 gtk/gtk9slice.h                                |   59 -
 gtk/gtkborderimage.c                           |  451 +++++
 gtk/gtkborderimageprivate.h                    |   67 +
 gtk/gtkcssprovider.c                           |   50 +-
 gtk/gtkcsstypes.c                              |    1 +
 gtk/gtkcsstypesprivate.h                       |   15 +
 gtk/gtkfilechooserbutton.c                     |    1 +
 gtk/gtkfilechooserdefault.c                    |    1 +
 gtk/gtkhbox.c                                  |   10 +-
 gtk/gtkmenu.c                                  |    2 +-
 gtk/gtkprinteroption.h                         |    3 +-
 gtk/gtkprinteroptionwidget.c                   |   23 +
 gtk/gtkstyleproperties.c                       |    1 +
 gtk/gtkstyleproperty.c                         |  190 ++-
 gtk/gtkthemingengine.c                         |   57 +-
 gtk/gtktoolitemgroup.c                         |    6 -
 gtk/gtktoolpalette.c                           |   33 -
 gtk/gtkvbox.c                                  |   10 +-
 modules/other/gail/gaillabel.c                 |   31 -
 modules/other/gail/gailscrollbar.c             |   43 +-
 modules/other/gail/gailwidget.c                |    2 +-
 tests/reftests/Makefile.am                     |   20 +
 tests/reftests/border-image-3-balls-green.png  |  Bin 0 -> 831 bytes
 tests/reftests/border-image-3-balls-yellow.png |  Bin 0 -> 775 bytes
 tests/reftests/border-image-ball-green.png     |  Bin 0 -> 787 bytes
 tests/reftests/border-image-ball-red.png       |  Bin 0 -> 773 bytes
 tests/reftests/border-image-ball-yellow.png    |  Bin 0 -> 707 bytes
 tests/reftests/border-image-balls.png          |  Bin 0 -> 2537 bytes
 tests/reftests/border-image-excess-size.css    |   16 +
 tests/reftests/border-image-excess-size.ref.ui |   76 +
 tests/reftests/border-image-excess-size.ui     |   17 +
 tests/reftests/border-image-gradient.css       |   20 +
 tests/reftests/border-image-gradient.ref.ui    |   22 +
 tests/reftests/border-image-gradient.ui        |   22 +
 tests/reftests/border-image-repeat.css         |   59 +
 tests/reftests/border-image-repeat.ref.ui      | 2414 ++++++++++++++++++++++++
 tests/reftests/border-image-repeat.sh          |  238 +++
 tests/reftests/border-image-repeat.ui          |  288 +++
 tests/reftests/border-image-url.css            |   15 +
 tests/reftests/border-image-url.ref.ui         |   22 +
 tests/reftests/border-image-url.ui             |   22 +
 tests/testgtk.c                                |    5 +-
 tests/testtreeview.c                           |    3 +-
 46 files changed, 4055 insertions(+), 647 deletions(-)
---