[gtk+/treeview-refactor: 635/642] Merge branch 'master' into treeview-refactor
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/treeview-refactor: 635/642] Merge branch 'master' into treeview-refactor
- Date: Sun, 5 Dec 2010 04:09:33 +0000 (UTC)
commit 0d786985a368d88e8ab4e45fc3607efc5e773732
Merge: 1d3961b cd76b05
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Sun Dec 5 00:36:37 2010 +0900
Merge branch 'master' into treeview-refactor
Conflicts:
gtk/gtkmarshalers.list
tests/Makefile.am
config.h.win32.in | 6 -
configure.ac | 22 -
demos/gtk-demo/colorsel.c | 65 +-
demos/gtk-demo/combobox.c | 6 +-
demos/gtk-demo/main.c | 2 +-
demos/gtk-demo/offscreen_window.c | 25 +-
demos/gtk-demo/offscreen_window2.c | 19 +-
demos/gtk-demo/rotated_text.c | 50 +-
demos/gtk-demo/textview.c | 6 +-
docs/reference/gdk/gdk-docs.sgml | 1 -
docs/reference/gdk/gdk3-overrides.txt | 23 -
docs/reference/gdk/gdk3-sections.txt | 45 +-
docs/reference/gdk/gdk3.types | 3 +-
docs/reference/gtk/Makefile.am | 29 +
docs/reference/gtk/gtk-docs.sgml | 23 +-
docs/reference/gtk/gtk3-sections.txt | 345 ++-
docs/reference/gtk/gtk3.types | 4 +
docs/reference/gtk/images/arrows.png | Bin 0 -> 549 bytes
docs/reference/gtk/images/background.png | Bin 0 -> 1400 bytes
docs/reference/gtk/images/border1.png | Bin 0 -> 961 bytes
docs/reference/gtk/images/border2.png | Bin 0 -> 1684 bytes
docs/reference/gtk/images/border3.png | Bin 0 -> 2713 bytes
docs/reference/gtk/images/checks.png | Bin 0 -> 529 bytes
docs/reference/gtk/images/ease-in-out.png | Bin 0 -> 8955 bytes
docs/reference/gtk/images/ease-in.png | Bin 0 -> 8862 bytes
docs/reference/gtk/images/ease-out.png | Bin 0 -> 8819 bytes
docs/reference/gtk/images/ease.png | Bin 0 -> 9216 bytes
docs/reference/gtk/images/expanders.png | Bin 0 -> 697 bytes
docs/reference/gtk/images/extensions.png | Bin 0 -> 475 bytes
docs/reference/gtk/images/focus.png | Bin 0 -> 371 bytes
docs/reference/gtk/images/frame-gap.png | Bin 0 -> 322 bytes
docs/reference/gtk/images/frames.png | Bin 0 -> 3393 bytes
docs/reference/gtk/images/gradient1.png | Bin 0 -> 722 bytes
docs/reference/gtk/images/gradient2.png | Bin 0 -> 397 bytes
docs/reference/gtk/images/gradient3.png | Bin 0 -> 2579 bytes
docs/reference/gtk/images/gradient4.png | Bin 0 -> 4901 bytes
docs/reference/gtk/images/handles.png | Bin 0 -> 660 bytes
docs/reference/gtk/images/linear.png | Bin 0 -> 8693 bytes
docs/reference/gtk/images/options.png | Bin 0 -> 1048 bytes
docs/reference/gtk/images/slices.png | Bin 0 -> 1217 bytes
docs/reference/gtk/images/sliders.png | Bin 0 -> 470 bytes
docs/reference/gtk/migrating-2to3.xml | 6 +-
.../reference/gtk/migrating-ClientSideWindows.sgml | 14 +-
docs/reference/gtk/migrating-GtkStyleContext.xml | 631 ++++
docs/reference/gtk/tmpl/gtkenums.sgml | 19 +-
docs/reference/gtk/tmpl/gtkrc.sgml | 4 +
docs/tools/shooter.c | 2 +-
gdk/Makefile.am | 12 -
gdk/gdk.h | 1 -
gdk/gdk.symbols | 14 +-
gdk/gdkcairo.c | 78 +-
gdk/gdkcairo.h | 4 +-
gdk/gdkdevice.c | 10 +-
gdk/gdkdisplay.c | 9 +-
gdk/gdkdraw.c | 123 -
gdk/gdkdrawable.h | 95 -
gdk/gdkevents.c | 21 +-
gdk/gdkevents.h | 22 -
gdk/gdkinternals.h | 50 +-
gdk/gdkmedialib.c | 120 -
gdk/gdkmedialib.h | 45 -
gdk/gdkoffscreenwindow.c | 211 +-
gdk/gdkpixbuf-drawable.c | 2 +-
gdk/gdkprivate.h | 15 -
gdk/gdktypes.h | 4 +-
gdk/gdkwindow.c | 2262 +++++------
gdk/gdkwindow.h | 25 +-
gdk/gdkwindowimpl.c | 18 +-
gdk/gdkwindowimpl.h | 29 +-
gdk/quartz/GdkQuartzWindow.c | 10 +-
gdk/quartz/gdkeventloop-quartz.c | 3 +-
gdk/quartz/gdkwindow-quartz.c | 26 +-
gdk/tests/gdk-color.c | 1 -
gdk/win32/gdkdrawable-win32.c | 12 -
gdk/win32/gdkevents-win32.c | 93 +-
gdk/win32/gdkwindow-win32.c | 28 +-
gdk/x11/Makefile.am | 2 -
gdk/x11/gdkcursor-x11.c | 2 +-
gdk/x11/gdkdevice-core.c | 27 +-
gdk/x11/gdkdevice-xi.c | 4 +-
gdk/x11/gdkdevice-xi2.c | 8 +-
gdk/x11/gdkdevicemanager-core.c | 20 +-
gdk/x11/gdkdevicemanager-xi2.c | 2 +-
gdk/x11/gdkdisplay-x11.c | 74 +-
gdk/x11/gdkdnd-x11.c | 134 +-
gdk/x11/gdkdrawable-x11.c | 235 --
gdk/x11/gdkdrawable-x11.h | 75 -
gdk/x11/gdkeventsource.c | 8 +-
gdk/x11/gdkgeometry-x11.c | 44 +-
gdk/x11/gdkinput.c | 26 +-
gdk/x11/gdkkeys-x11.c | 5 +-
gdk/x11/gdkprivate-x11.h | 6 +-
gdk/x11/gdkproperty-x11.c | 4 +-
gdk/x11/gdkscreen-x11.c | 2 +-
gdk/x11/gdkselection-x11.c | 6 +-
gdk/x11/gdktestutils-x11.c | 26 +-
gdk/x11/gdkwindow-x11.c | 699 ++--
gdk/x11/gdkwindow-x11.h | 23 +-
gdk/x11/gdkx.h | 52 +-
gtk/Makefile.am | 80 +-
gtk/gtk.h | 9 +
gtk/gtk.symbols | 7 +-
gtk/gtk9slice.c | 375 ++
gtk/gtk9slice.h | 59 +
gtk/gtkanimationdescription.c | 137 +
gtk/gtkanimationdescription.h | 49 +
gtk/gtkborder.c | 76 +
gtk/gtkborder.h | 68 +
gtk/gtkbutton.c | 120 +-
gtk/gtkcellrenderer.c | 6 +-
gtk/gtkcellrendererpixbuf.c | 26 +-
gtk/gtkcheckbutton.c | 88 +-
gtk/gtkcombobox.c | 309 +-
gtk/gtkcontainer.c | 53 +
gtk/gtkcontainer.h | 5 +
gtk/gtkcssprovider.c | 3847 +++++++++++++++++++
gtk/gtkcssprovider.h | 79 +
gtk/gtkentry.c | 23 +-
gtk/gtkenums.h | 106 +-
gtk/gtkexpander.c | 13 +-
gtk/gtkgradient.c | 282 ++
gtk/gtkgradient.h | 61 +
gtk/gtkiconfactory.c | 224 +-
gtk/gtkiconfactory.h | 1 -
gtk/gtkicontheme.c | 94 +-
gtk/gtkicontheme.h | 7 +
gtk/gtkiconview.c | 4 +-
gtk/gtkimage.c | 24 +-
gtk/gtkimcontextsimple.c | 2 +-
gtk/gtkimmodule.c | 4 +-
gtk/gtkimmulticontext.c | 2 +-
gtk/gtkinfobar.c | 49 +-
gtk/gtklabel.c | 77 +-
gtk/gtkmain.c | 8 +-
gtk/gtkmarshalers.list | 1 +
gtk/gtkmenu.c | 380 ++-
gtk/gtkmenubar.c | 59 +-
gtk/gtkmenuitem.c | 6 +-
gtk/gtkmodifierstyle.c | 287 ++
gtk/gtkmodifierstyle.h | 74 +
gtk/gtknotebook.c | 62 +-
gtk/gtkplug-x11.c | 10 +-
gtk/gtkradiobutton.c | 74 +-
gtk/gtkrange.c | 16 +-
gtk/gtkrc.c | 55 +-
gtk/gtkrc.h | 4 +
gtk/gtkscrollbar.c | 4 +
gtk/gtkselection.c | 2 +-
gtk/gtksettings.c | 188 +-
gtk/gtksettings.h | 2 +
gtk/gtksocket-x11.c | 45 +-
gtk/gtkspinner.c | 157 +-
gtk/gtkstatusicon.c | 10 +-
gtk/gtkstyle.c | 3106 ++++++----------
gtk/gtkstyle.h | 33 +-
gtk/gtkstylecontext.c | 3985 ++++++++++++++++++++
gtk/gtkstylecontext.h | 564 +++
gtk/gtkstyleproperties.c | 1226 ++++++
gtk/gtkstyleproperties.h | 117 +
gtk/gtkstyleprovider.c | 148 +
gtk/gtkstyleprovider.h | 128 +
gtk/gtksymboliccolor.c | 558 +++
gtk/gtksymboliccolor.h | 55 +
gtk/gtktextbufferserialize.c | 4 -
gtk/gtkthemes.h | 4 +
gtk/gtkthemingengine.c | 3059 +++++++++++++++
gtk/gtkthemingengine.h | 251 ++
gtk/gtktimeline.c | 735 ++++
gtk/gtktimeline.h | 117 +
gtk/gtktogglebutton.c | 28 +-
gtk/gtktoolitemgroup.c | 2 +-
gtk/gtktrayicon-x11.c | 4 +-
gtk/gtkwidget.c | 1197 +++++-
gtk/gtkwidget.h | 93 +-
gtk/gtkwidgetpath.c | 1048 +++++
gtk/gtkwidgetpath.h | 113 +
gtk/gtkwindow.c | 76 +-
gtk/gtkxembed.c | 4 +-
gtk/tests/Makefile.am | 9 +-
gtk/tests/stylecontext.c | 534 +++
gtk/tests/test.png | Bin 0 -> 3569 bytes
modules/input/gtkimcontextxim.c | 10 +-
modules/other/gail/gailwindow.c | 12 +-
po-properties/es.po | 2395 ++++++------
po-properties/he.po | 2252 ++++++------
po/es.po | 417 ++-
po/he.po | 410 ++-
po/sl.po | 4 +-
tests/Makefile.am | 16 +-
tests/gtkoffscreenbox.c | 31 +-
tests/styleexamples.c | 384 ++
tests/testadjustsize.c | 14 +-
tests/testcalendar.c | 27 +-
tests/testcombochange.c | 27 +-
tests/testexpand.c | 20 +-
tests/testframe.c | 84 +-
tests/testgrid.c | 6 +-
tests/testgtk.c | 167 +-
tests/testgtk.css | 33 +
tests/testgtk2.css | 9 +
tests/testgtkrc | 228 --
tests/testgtkrc2 | 21 -
tests/testtext.c | 3082 ---------------
tests/testtooltips.c | 4 +-
tests/testwindows.c | 5 +-
205 files changed, 28335 insertions(+), 12508 deletions(-)
---
diff --cc gtk/gtkmarshalers.list
index 9279037,10f0dfd..fa60a7c
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@@ -69,7 -69,7 +69,8 @@@ VOID:ENUM,FLOAT,BOOLEA
VOID:ENUM,INT
VOID:ENUM,INT,BOOLEAN
VOID:ENUM,BOXED
+VOID:ENUM,STRING
+ VOID:FLAGS
VOID:INT
VOID:INT,BOOLEAN
VOID:INT,INT
diff --cc tests/Makefile.am
index 2832853,50e3a31..3bfd2ac
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -98,8 -98,8 +98,9 @@@ noinst_PROGRAMS = $(TEST_PROGS)
testexpander \
testvolumebutton \
testscrolledwindow \
+ testcellarea \
- testswitch
+ testswitch \
+ styleexamples
if USE_X11
noinst_PROGRAMS += testerrors
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
