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

[John Ralls <jralls src gnome org>]

commit 94f07da963c812e0b917805d37a94a46f992b1ac
Merge: 8470e70 d2303ba
Author: John Ralls <jralls ceridwen us>
Date:   Fri Apr 8 23:21:12 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/gdkdevice.c                 |   10 ----------
 gdk/gdkdeviceprivate.h          |    3 ---
 gdk/gdkdisplay.c                |    3 ++-
 gdk/gdkevents.c                 |    6 +++++-
 gdk/gdkoffscreenwindow.c        |   25 ++++++++++++++++++-------
 gdk/win32/gdkdevice-wintab.c    |    2 +-
 gdk/x11/gdkdevice-xi.c          |    2 +-
 gdk/x11/gdkdevice-xi2.c         |    2 +-
 gdk/x11/gdkdevicemanager-xi2.c  |    2 +-
 gdk/x11/gdkdisplay-x11.c        |    3 +++
 gdk/x11/gdkdisplaymanager-x11.c |    3 ++-
 gdk/x11/gdkgeometry-x11.c       |   13 +++++++++++++
 gdk/x11/gdkprivate-x11.h        |    2 ++
 gtk/gtkcalendar.c               |    2 ++
 gtk/gtknotebook.c               |   12 +++++-------
 gtk/gtkprintunixdialog.c        |    2 +-
 gtk/gtkseparator.c              |    2 ++
 gtk/gtkthemingengine.c          |    3 +--
 18 files changed, 60 insertions(+), 37 deletions(-)
---