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

[John Ralls <jralls src gnome org>]

commit 085c618319208249c8981d50845c4d0dc82cee1b
Merge: 743658a a4a2d76
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jan 21 23:21:10 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/gdkdevice.c             |    2 +-
 gdk/gdkwindow.c             |    2 +-
 gdk/win32/gdkvisual-win32.c |    4 ---
 gtk/gtkappchooserbutton.c   |    2 +-
 gtk/gtkappchooserwidget.c   |   22 ++++++---------
 gtk/gtkbutton.c             |   24 +++++++++-------
 gtk/gtkentry.c              |    6 ----
 gtk/gtkfilechooserdefault.c |   63 ++++++++++++++++++++++++++++++++----------
 gtk/gtkfilechooserdialog.c  |   23 ---------------
 gtk/gtkspinbutton.c         |   10 +-----
 gtk/gtktextdisplay.c        |    3 --
 gtk/gtkwidget.c             |   16 +++++++++++
 12 files changed, 92 insertions(+), 85 deletions(-)
---