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

[John Ralls <jralls src gnome org>]

commit ad8d4dcecbe9aa694e03e303cc9060996e864976
Merge: cc7319b acf1345
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jan 2 10:25:48 2011 -0800

    Merge branch 'master' into quartz-integration

 gdk/gdk.symbols                    |    9 +-
 gdk/gdkdisplaymanager.c            |    8 +
 gdk/makefile.msc                   |   78 +-
 gdk/quartz/gdkeventloop-quartz.c   |   19 +-
 gdk/win32/gdkcursor-win32.c        |  115 +-
 gdk/win32/gdkdevice-win32.c        |   28 +-
 gdk/win32/gdkdevice-wintab.c       |    2 +-
 gdk/win32/gdkdevicemanager-win32.c |   13 +-
 gdk/win32/gdkdevicemanager-win32.h |    2 +-
 gdk/win32/gdkdisplay-win32.c       |  212 +-
 gdk/win32/gdkdnd-win32.c           |  143 +-
 gdk/win32/gdkdrawable-win32.c      |  222 -
 gdk/win32/gdkdrawable-win32.h      |   73 -
 gdk/win32/gdkevents-win32.c        |  188 +-
 gdk/win32/gdkgeometry-win32.c      |  138 +-
 gdk/win32/gdkim-win32.c            |   44 -
 gdk/win32/gdkinput.c               |   11 +-
 gdk/win32/gdkkeys-win32.c          |   88 +-
 gdk/win32/gdkmain-win32.c          |   72 +-
 gdk/win32/gdkprivate-win32.h       |  157 +-
 gdk/win32/gdkproperty-win32.c      |   28 +-
 gdk/win32/gdkscreen-win32.c        |  147 +-
 gdk/win32/gdkselection-win32.c     |   65 +-
 gdk/win32/gdkspawn-win32.c         |  106 -
 gdk/win32/gdktestutils-win32.c     |    9 +-
 gdk/win32/gdkvisual-win32.c        |   79 +-
 gdk/win32/gdkwin32.h               |   27 +-
 gdk/win32/gdkwin32cursor.h         |   56 +
 gdk/win32/gdkwin32display.h        |   56 +
 gdk/win32/gdkwin32displaymanager.h |   49 +
 gdk/win32/gdkwin32dnd.h            |   49 +
 gdk/win32/gdkwin32keys.h           |   49 +
 gdk/win32/gdkwin32screen.h         |   56 +
 gdk/win32/gdkwin32window.h         |   56 +
 gdk/win32/gdkwindow-win32.c        |  998 ++--
 gdk/win32/gdkwindow-win32.h        |   40 +-
 gdk/win32/makefile.msc             |   15 +-
 gtk/gtk.symbols                    |   16 +
 gtk/gtkapplication.c               |    2 +
 gtk/gtkcssprovider.c               |    1 +
 gtk/gtkplug-win32.c                |    5 +-
 gtk/gtkplug.c                      |    7 +
 gtk/gtkprintoperation-win32.c      |    2 +-
 gtk/gtksocket-win32.c              |   54 +-
 gtk/gtkstatusicon.c                |    5 +-
 gtk/gtktimeline.c                  |    2 +-
 gtk/gtkwin32embedwidget.c          |   10 +-
 gtk/makefile.msc.in                |  234 +-
 makefile.msc                       |    2 +-
 po/ug.po                           |10016 ++++++++++++++++++------------------
 tests/makefile.msc                 |   16 +-
 tests/testcairo.c                  |    5 +-
 52 files changed, 7079 insertions(+), 6805 deletions(-)
---