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



commit 534a020b8047bbe7313af8fc614cfe45b105ae9e
Merge: 58e4827 bb26d30
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jun 12 23:21:23 2011 -0700

    Merge branch 'master' into quartz-integration

 NEWS                                 |   81 +++++
 configure.ac                         |    1 +
 demos/gtk-demo/Makefile.am           |    1 +
 demos/gtk-demo/colorsel.c            |    7 +-
 demos/gtk-demo/overlay.c             |  181 ++++++++++
 docs/reference/gtk/gtk-docs.sgml     |    1 +
 docs/reference/gtk/gtk3-sections.txt |   26 ++
 docs/reference/gtk/gtk3.types        |    1 +
 gtk/Makefile.am                      |    2 +
 gtk/gtk.h                            |    1 +
 gtk/gtk.symbols                      |    4 +
 gtk/gtkcssprovider.c                 |   10 +-
 gtk/gtkdnd.c                         |    4 +
 gtk/gtkmenuitem.c                    |    3 +-
 gtk/gtkoverlay.c                     |  635 ++++++++++++++++++++++++++++++++++
 gtk/gtkoverlay.h                     |   79 +++++
 gtk/gtktextview.c                    |   22 +-
 gtk/gtkthemingengine.c               |   61 +++-
 modules/other/gail/gailtextcell.c    |    2 +-
 tests/Makefile.am                    |    6 +
 tests/prop-editor.c                  |   20 +-
 tests/testcombo.c                    |   10 +-
 tests/testoverlay.c                  |  447 ++++++++++++++++++++++++
 tests/testtreemenu.c                 |   10 +-
 24 files changed, 1545 insertions(+), 70 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]