[gtk+/quartz-integration: 128/128] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 128/128] Merge branch 'master' into quartz-integration
- Date: Thu, 19 May 2011 06:30:35 +0000 (UTC)
commit cc27724c284b3661e03c92807dd034b14be5ef45
Merge: a1567a2 7a06006
Author: John Ralls <jralls ceridwen us>
Date: Wed May 18 23:21:21 2011 -0700
Merge branch 'master' into quartz-integration
configure.ac | 2 +
docs/reference/gtk/gtk3-sections.txt | 5 +
gdk/gdkwindow.c | 4 +
gdk/x11/gdkdevicemanager-xi2.c | 46 +-
gdk/x11/gdkeventsource.c | 100 +-
gdk/x11/gdkeventtranslator.c | 23 +-
gdk/x11/gdkeventtranslator.h | 5 +
gtk/Makefile.am | 6 +
gtk/gtk-keys.css.emacs | 8 +-
gtk/gtk-keys.css.mac | 38 +-
gtk/gtk.symbols | 5 +
gtk/gtkanimationdescription.c | 43 +
gtk/gtkanimationdescription.h | 1 +
gtk/gtkbutton.c | 17 +-
gtk/gtkcombobox.c | 37 +-
gtk/gtkcssparser.c | 945 +++++
gtk/gtkcssparserprivate.h | 87 +
gtk/gtkcssprovider.c | 3698 +++++++-------------
gtk/gtkcssprovider.h | 16 +-
gtk/gtkcssselector.c | 459 +++
gtk/gtkcssselectorprivate.h | 58 +
gtk/gtkcssstringfuncs.c | 1208 +++++++
gtk/gtkcssstringfuncsprivate.h | 37 +
gtk/gtkgradient.c | 100 +
gtk/gtkgradient.h | 2 +
gtk/gtklabel.c | 24 +-
gtk/gtkmarshalers.list | 1 +
gtk/gtkmenu.c | 151 +-
gtk/gtkmenubar.c | 34 +-
gtk/gtkmenuitem.c | 37 +-
gtk/gtkstyle.c | 13 +-
gtk/gtkstyleproperties.c | 272 +-
gtk/gtkstyleproperties.h | 4 +
gtk/gtkstylepropertiesprivate.h | 11 +-
gtk/gtksymboliccolor.c | 76 +-
gtk/gtksymboliccolor.h | 2 +
gtk/gtktreeview.c | 11 +-
tests/Makefile.am | 2 +-
tests/css/Makefile.am | 1 +
tests/css/parser/Makefile.am | 79 +
tests/css/parser/boolean.css | 48 +
tests/css/parser/boolean.errors | 8 +
tests/css/parser/boolean.ref.css | 31 +
tests/css/parser/border.css | 59 +
tests/css/parser/border.errors | 8 +
tests/css/parser/border.ref.css | 31 +
tests/css/parser/close-at-end-of-file.css | 2 +
tests/css/parser/close-at-end-of-file.errors | 1 +
tests/css/parser/close-at-end-of-file.ref.css | 3 +
tests/css/parser/colors-red.css | 59 +
tests/css/parser/colors-red.ref.css | 59 +
tests/css/parser/css-21-malformed-declarations.css | 7 +
.../parser/css-21-malformed-declarations.errors | 6 +
.../parser/css-21-malformed-declarations.ref.css | 27 +
tests/css/parser/css-21-malformed-statements.css | 4 +
.../css/parser/css-21-malformed-statements.errors | 4 +
tests/css/parser/declarations.css | 50 +
tests/css/parser/declarations.errors | 14 +
tests/css/parser/declarations.ref.css | 28 +
tests/css/parser/does-not-exist.css | 3 +
tests/css/parser/does-not-exist.errors | 1 +
tests/css/parser/enum.css | 32 +
tests/css/parser/enum.errors | 6 +
tests/css/parser/enum.ref.css | 7 +
tests/css/parser/import-cyclic-1.css | 5 +
tests/css/parser/import-cyclic-1.errors | 1 +
tests/css/parser/import-cyclic-1.ref.css | 11 +
tests/css/parser/import-cyclic-2.css | 5 +
tests/css/parser/import-cyclic-2.errors | 1 +
tests/css/parser/import-cyclic-2.ref.css | 11 +
tests/css/parser/import-cyclic-3.css | 5 +
tests/css/parser/import-cyclic-3.errors | 1 +
tests/css/parser/import-cyclic-3.ref.css | 11 +
tests/css/parser/import-nonexistant.css | 5 +
tests/css/parser/import-nonexistant.errors | 1 +
tests/css/parser/import-nonexistant.ref.css | 3 +
tests/css/parser/import-recursive.css | 5 +
tests/css/parser/import-recursive.errors | 1 +
tests/css/parser/import-recursive.ref.css | 3 +
tests/css/parser/integer.css | 42 +
tests/css/parser/integer.errors | 8 +
tests/css/parser/integer.ref.css | 23 +
tests/css/parser/no-semicolon.css | 4 +
tests/css/parser/no-semicolon.ref.css | 7 +
tests/css/parser/pseudo-classes-unknown.css | 23 +
tests/css/parser/pseudo-classes-unknown.errors | 6 +
tests/css/parser/selector.css | 280 ++
tests/css/parser/selector.errors | 1 +
tests/css/parser/selector.ref.css | 279 ++
tests/css/parser/test-css-parser.c | 425 +++
tests/reftests/Makefile.am | 31 +
tests/reftests/css-match-class.css | 15 +
tests/reftests/css-match-class.ref.ui | 15 +
tests/reftests/css-match-class.ui | 14 +
tests/reftests/css-match-descendant-later.css | 11 +
tests/reftests/css-match-descendant-later.ref.ui | 19 +
tests/reftests/css-match-descendant-later.ui | 43 +
tests/reftests/css-match-exact.css | 3 +
tests/reftests/css-match-exact.ref.ui | 13 +
tests/reftests/css-match-exact.ui | 30 +
tests/reftests/css-match-inherit.css | 11 +
tests/reftests/css-match-inherit.ref.ui | 22 +
tests/reftests/css-match-inherit.ui | 19 +
tests/reftests/css-match-name.css | 15 +
tests/reftests/css-match-name.ref.ui | 15 +
tests/reftests/css-match-name.ui | 14 +
tests/reftests/css-match-region-matches-star.css | 8 +
.../reftests/css-match-region-matches-star.ref.ui | 32 +
tests/reftests/css-match-region-matches-star.ui | 31 +
tests/reftests/css-match-regions.css | 19 +
tests/reftests/css-match-regions.ref.ui | 71 +
tests/reftests/css-match-regions.ui | 68 +
tests/reftests/css-match-style-property-order.css | 12 +
.../reftests/css-match-style-property-order.ref.ui | 19 +
tests/reftests/css-match-style-property-order.ui | 19 +
tests/reftests/css-match-subtype.css | 11 +
tests/reftests/css-match-subtype.ref.ui | 15 +
tests/reftests/css-match-subtype.ui | 14 +
tests/reftests/css-match-type.css | 11 +
tests/reftests/css-match-type.ref.ui | 15 +
tests/reftests/css-match-type.ui | 14 +
tests/reftests/entry-progress-coloring.css | 1 +
tests/reftests/green-20x20.png | Bin 0 -> 103 bytes
123 files changed, 7075 insertions(+), 2908 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
