[gtk+/quartz-integration: 15/15] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 15/15] Merge branch 'master' into quartz-integration
- Date: Thu, 21 Jul 2011 06:28:54 +0000 (UTC)
commit 12908a773209848793ab1f990ec91282b29351d4
Merge: ea6c225 d56e8c8
Author: John Ralls <jralls ceridwen us>
Date: Wed Jul 20 23:21:04 2011 -0700
Merge branch 'master' into quartz-integration
docs/reference/gtk/gtk3-sections.txt | 1 +
gtk/gtkcssprovider.c | 4 +-
gtk/gtkfilechooserdefault.c | 2 +-
gtk/gtkroundedbox.c | 28 ++++++
gtk/gtkstyleproperty.c | 87 ++++++++++++++++-
gtk/gtkthemingengine.c | 5 +-
gtk/gtkthemingengine.h | 3 +-
gtk/tests/Makefile.am | 2 +-
gtk/tests/stylecontext.c | 103 --------------------
gtk/tests/test.png | Bin 3569 -> 0 bytes
tests/css/parser/Makefile.am | 75 ++++++++++++++
tests/css/parser/declarations-invalid-01.css | 1 +
tests/css/parser/declarations-invalid-01.errors | 1 +
.../css/parser/declarations-invalid-01.ref.css | 0
tests/css/parser/declarations-invalid-02.css | 1 +
tests/css/parser/declarations-invalid-02.errors | 1 +
tests/css/parser/declarations-invalid-02.ref.css | 3 +
tests/css/parser/declarations-invalid-03.css | 1 +
tests/css/parser/declarations-invalid-03.errors | 1 +
tests/css/parser/declarations-invalid-03.ref.css | 3 +
tests/css/parser/declarations-invalid-04.css | 1 +
tests/css/parser/declarations-invalid-04.errors | 1 +
tests/css/parser/declarations-invalid-04.ref.css | 3 +
tests/css/parser/declarations-invalid-05.css | 1 +
tests/css/parser/declarations-invalid-05.errors | 1 +
tests/css/parser/declarations-invalid-05.ref.css | 3 +
tests/css/parser/declarations-invalid-06.css | 1 +
tests/css/parser/declarations-invalid-06.errors | 1 +
tests/css/parser/declarations-invalid-06.ref.css | 3 +
tests/css/parser/declarations-invalid-07.css | 1 +
tests/css/parser/declarations-invalid-07.errors | 1 +
tests/css/parser/declarations-invalid-07.ref.css | 3 +
tests/css/parser/declarations-invalid-08.css | 1 +
tests/css/parser/declarations-invalid-08.errors | 3 +
.../css/parser/declarations-invalid-08.ref.css | 0
tests/css/parser/declarations-valid-01.css | 1 +
.../css/parser/declarations-valid-01.ref.css | 0
tests/css/parser/declarations-valid-02.css | 1 +
tests/css/parser/declarations-valid-02.ref.css | 7 ++
tests/css/parser/declarations-valid-03.css | 1 +
tests/css/parser/declarations-valid-03.ref.css | 7 ++
tests/css/parser/declarations-valid-04.css | 1 +
tests/css/parser/declarations-valid-04.ref.css | 7 ++
tests/css/parser/declarations-valid-05.css | 1 +
tests/css/parser/declarations-valid-05.ref.css | 3 +
tests/css/parser/declarations-valid-06.css | 1 +
.../css/parser/declarations-valid-06.ref.css | 0
tests/css/parser/declarations-valid-07.css | 3 +
.../css/parser/declarations-valid-07.ref.css | 0
tests/css/parser/declarations-valid-08.css | 1 +
tests/css/parser/declarations-valid-08.ref.css | 7 ++
tests/css/parser/declarations-valid-09.css | 1 +
tests/css/parser/declarations-valid-09.ref.css | 4 +
tests/css/parser/declarations-valid-10.css | 1 +
tests/css/parser/declarations-valid-10.ref.css | 6 +
tests/css/parser/declarations-valid-11.css | 1 +
tests/css/parser/declarations-valid-11.ref.css | 6 +
tests/css/parser/declarations-valid-12.css | 1 +
tests/css/parser/declarations-valid-12.ref.css | 6 +
tests/css/parser/declarations-valid-13.css | 1 +
tests/css/parser/declarations-valid-13.ref.css | 6 +
tests/css/parser/declarations-valid-14.css | 1 +
tests/css/parser/declarations-valid-14.ref.css | 6 +
tests/css/parser/declarations-valid-15.css | 1 +
tests/css/parser/declarations-valid-15.ref.css | 6 +
tests/css/parser/declarations-valid-16.css | 1 +
tests/css/parser/declarations-valid-16.ref.css | 10 ++
tests/css/parser/declarations-valid-17.css | 1 +
tests/css/parser/declarations-valid-17.ref.css | 6 +
tests/css/parser/declarations-valid-18.css | 1 +
tests/css/parser/declarations-valid-18.errors | 1 +
.../css/parser/declarations-valid-18.ref.css | 0
tests/css/parser/declarations-valid-19.css | 3 +
tests/css/parser/declarations-valid-19.ref.css | 3 +
tests/css/parser/declarations-valid-20.css | 5 +
tests/css/parser/declarations-valid-20.ref.css | 3 +
tests/css/parser/declarations-valid-21.css | 6 +
tests/css/parser/declarations-valid-21.ref.css | 3 +
tests/css/parser/declarations-valid-22.css | 1 +
tests/css/parser/declarations-valid-22.ref.css | 6 +
tests/css/parser/declarations-valid-23.css | 1 +
tests/css/parser/declarations-valid-23.ref.css | 6 +
tests/css/parser/declarations-valid-24.css | 1 +
tests/css/parser/declarations-valid-24.ref.css | 3 +
tests/css/parser/declarations-valid-25.css | 1 +
tests/css/parser/declarations-valid-25.ref.css | 3 +
tests/css/parser/test.png | Bin 0 -> 148 bytes
tests/reftests/Makefile.am | 3 +
tests/reftests/border-radius-clamp.css | 9 ++
tests/reftests/border-radius-clamp.ref.ui | 18 ++++
tests/reftests/border-radius-clamp.ui | 17 +++
91 files changed, 429 insertions(+), 117 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]