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

[John Ralls <jralls src gnome org>]

commit 55e83b76725f8c8acc07b557e00bbaee3c84ba2b
Merge: 554e656 668604d
Author: John Ralls <jralls ceridwen us>
Date:   Fri Dec 17 04:27:24 2010 -0800

    Merge branch 'master' into quartz-integration

 demos/gtk-demo/assistant.c                  |    6 +-
 demos/gtk-demo/clipboard.c                  |    6 +-
 demos/gtk-demo/combobox.c                   |    4 +-
 demos/gtk-demo/stock_browser.c              |    6 +-
 demos/gtk-demo/toolpalette.c                |    2 +-
 docs/reference/gdk/Makefile.am              |    3 +-
 docs/reference/gdk/gdk3-sections.txt        |    4 +-
 docs/reference/gtk/Makefile.am              |    3 +-
 docs/reference/gtk/gtk-docs.sgml            |    3 +
 docs/reference/gtk/gtk3-sections.txt        |  120 +-
 docs/reference/gtk/gtk3.types               |    3 +
 docs/reference/gtk/tmpl/gtkcelllayout.sgml  |  186 --
 docs/reference/gtk/tmpl/gtkdrawingarea.sgml |   49 +-
 gdk/gdk.c                                   |   16 +-
 gdk/gdk.symbols                             |    4 +-
 gdk/gdkdevice.c                             |  120 +
 gdk/gdkdevice.h                             |    1 +
 gdk/gdkdevicemanager.c                      |   31 +-
 gdk/gdkdeviceprivate.h                      |    4 +
 gdk/gdkdisplay.c                            |   19 +-
 gdk/gdkevents.c                             |   60 +
 gdk/gdkevents.h                             |    3 +
 gdk/gdkglobals.c                            |    2 +-
 gdk/gdkinternals.h                          |    9 +-
 gdk/gdkmain.h                               |    2 +-
 gdk/gdkwindow.c                             |  192 ++-
 gdk/gdkwindow.h                             |    6 +
 gdk/x11/gdkdevicemanager-x11.c              |    2 +-
 gdk/x11/gdkdevicemanager-xi2.c              |  178 ++-
 gdk/x11/gdkdevicemanager-xi2.h              |    1 -
 gdk/x11/gdkdisplay-x11.c                    |    2 +-
 gdk/x11/gdkmain-x11.c                       |    2 +-
 gtk/Makefile.am                             |    8 +
 gtk/gtk.h                                   |    3 +
 gtk/gtk.symbols                             |   70 +-
 gtk/gtkcellarea.c                           | 3618 +++++++++++++++++++++++++++
 gtk/gtkcellarea.h                           |  463 ++++
 gtk/gtkcellareabox.c                        | 2089 ++++++++++++++++
 gtk/gtkcellareabox.h                        |   84 +
 gtk/gtkcellareaboxcontext.c                 |  853 +++++++
 gtk/gtkcellareaboxcontext.h                 |  138 +
 gtk/gtkcellareacontext.c                    |  674 +++++
 gtk/gtkcellareacontext.h                    |  133 +
 gtk/gtkcelllayout.c                         |  437 +++-
 gtk/gtkcelllayout.h                         |   18 +-
 gtk/gtkcellrenderer.c                       |  129 +-
 gtk/gtkcellrenderer.h                       |   13 +
 gtk/gtkcellrendererspinner.c                |    7 +
 gtk/gtkcellrenderertext.c                   |   76 +-
 gtk/gtkcellrenderertoggle.c                 |    7 +
 gtk/gtkclipboard.c                          |   32 +-
 gtk/gtkcolorbutton.c                        |   12 +-
 gtk/gtkcolorsel.c                           |   30 +-
 gtk/gtkcombobox.c                           |    8 +-
 gtk/gtkcssprovider.c                        |    5 +-
 gtk/gtkdnd-quartz.c                         |    4 +-
 gtk/gtkdnd.c                                |   28 +-
 gtk/gtkentry.c                              |    8 +-
 gtk/gtkentrycompletion.c                    |  275 ++-
 gtk/gtkentrycompletion.h                    |    2 +
 gtk/gtkentryprivate.h                       |    1 +
 gtk/gtkfilechooserbutton.c                  |    2 +-
 gtk/gtkfilechooserdefault.c                 |   13 +-
 gtk/gtkiconview.c                           |    4 +-
 gtk/gtklinkbutton.c                         |    2 +-
 gtk/gtkmarshalers.list                      |    4 +
 gtk/gtknotebook.c                           |   15 +-
 gtk/gtkrc.c                                 | 1848 --------------
 gtk/gtksizerequest.c                        |   16 +
 gtk/gtkstylecontext.c                       |    6 +-
 gtk/gtkstylecontext.h                       |    7 +
 gtk/gtktextbuffer.c                         |   27 +-
 gtk/gtktextview.c                           |  155 +-
 gtk/gtktoolpalette.c                        |   30 +-
 gtk/gtktreednd.c                            |   10 +-
 gtk/gtktreeprivate.h                        |  451 +---
 gtk/gtktreeselection.c                      |  198 +-
 gtk/gtktreeview.c                           | 1620 ++++++++-----
 gtk/gtktreeviewcolumn.c                     | 2686 ++++++++-------------
 gtk/gtktreeviewcolumn.h                     |   56 +-
 gtk/gtkwidget.c                             |   45 +-
 gtk/gtkwidget.h                             |    3 -
 gtk/tests/treeview.c                        |   80 +
 modules/input/gtkimcontextxim.c             |   35 +-
 modules/other/gail/gailtreeview.c           |    2 +-
 modules/other/gail/libgail-util/gailmisc.c  |   42 +-
 po/es.po                                    |  308 ++--
 po/nb.po                                    |  306 ++--
 tests/Makefile.am                           |   11 +
 tests/cellareascaffold.c                    | 1140 +++++++++
 tests/cellareascaffold.h                    |   79 +
 tests/testassistant.c                       |    6 +-
 tests/testcellarea.c                        |  627 +++++
 tests/testcombo.c                           |   64 +-
 tests/testdnd.c                             |   16 +-
 tests/testgtk.c                             |   10 +-
 tests/testiconview-keynav.c                 |   36 +-
 tests/testimage.c                           |    2 +-
 tests/testinput.c                           |   17 +-
 tests/testnotebookdnd.c                     |    8 +-
 tests/testselection.c                       |   31 +-
 tests/testtooltips.c                        |    2 +-
 tests/testtreeedit.c                        |  117 +-
 tests/testtreeview.c                        |    5 +-
 tests/testverticalcells.c                   |  378 +++
 105 files changed, 14965 insertions(+), 5829 deletions(-)
---