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

[John Ralls <jralls src gnome org>]

commit 2b6eeec1bce203ccaababc4ec91b2b6e5d31f2d7
Merge: ab5b13c 3500063
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 27 23:21:08 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                 |    4 +++
 demos/gtk-demo/main.c        |   53 ++++++++++++++++++------------------
 demos/gtk-demo/textview.c    |   11 +++----
 docs/tools/shooter.c         |    6 +---
 gdk/x11/gdkeventsource.c     |    6 ++++
 gdk/x11/gdkeventtranslator.c |    8 +----
 gtk/gtkbutton.c              |    4 ---
 gtk/gtkcssselector.c         |   14 +++++-----
 gtk/gtkcssselectorprivate.h  |    2 +-
 gtk/gtkliststore.c           |   61 ++++++++++++++++++++---------------------
 gtk/gtkmenuitem.c            |    3 +-
 gtk/gtkstyleproperties.c     |    4 ---
 gtk/gtkstyleproperty.c       |    2 +
 gtk/gtktreeview.c            |   14 +---------
 gtk/gtkwidgetpath.h          |    2 +-
 tests/print-editor.c         |    2 -
 tests/testprint.c            |    5 +--
 tests/testtreeview.c         |   16 +++++------
 18 files changed, 96 insertions(+), 121 deletions(-)
---