[gtk+/gtkbuilder-gbinding: 2079/2079] Merge branch 'master' into gtkbuilder-gbinding
- From: Denis Washington <denisw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtkbuilder-gbinding: 2079/2079] Merge branch 'master' into gtkbuilder-gbinding
- Date: Tue, 14 Feb 2012 20:12:11 +0000 (UTC)
commit 3e0ae4bf9a2e21e9ce31536e4ec9ddbdf463fa5d
Merge: 143f943 abdbe20
Author: Denis Washington <denisw online de>
Date: Tue Feb 14 21:10:05 2012 +0100
Merge branch 'master' into gtkbuilder-gbinding
Conflicts:
gtk/gtkbuilder.c
gtk/tests/builder.c
Makefile.am | 6 -
Makefile.decl | 4 +-
NEWS | 553 ++
README.in | 5 +
README.win32 | 12 +-
build/win32/vs10/README.txt | 9 +-
build/win32/vs10/gtk+.props | 6 +-
build/win32/vs10/gtk.vcxprojin | 8 +-
build/win32/vs10/gtk3-demo.vcxproj | 1 +
build/win32/vs10/gtk3-demo.vcxproj.filters | 3 +
build/win32/vs9/README.txt | 9 +-
build/win32/vs9/gtk+.vsprops | 5 +-
build/win32/vs9/gtk.vcprojin | 8 +-
build/win32/vs9/gtk3-demo.vcproj | 1 +
configure.ac | 133 +-
debian/README.debian | 18 -
debian/build | 62 -
debian/changelog | 10 -
debian/control | 81 -
debian/copyright | 8 -
debian/libgtk-cvs-dev.files | 9 -
debian/libgtk-cvs-dev.postinst | 5 -
debian/libgtk-cvs-dev.prerm | 6 -
debian/libgtk-cvs-doc.files | 8 -
debian/libgtk-cvs-doc.postinst | 11 -
debian/libgtk-cvs-doc.prerm | 7 -
debian/postinst | 7 -
debian/rules | 160 -
demos/Makefile.am | 2 +-
demos/gtk-demo/Makefile.am | 34 +-
demos/gtk-demo/application-standalone.c | 3 +
demos/gtk-demo/application.c | 479 ++
demos/gtk-demo/application.gresource.xml | 11 +
demos/gtk-demo/application.ui | 104 +
demos/gtk-demo/appwindow.c | 166 +-
demos/gtk-demo/assistant.c | 22 +-
demos/gtk-demo/builder.c | 16 +-
demos/gtk-demo/button_box.c | 88 +-
demos/gtk-demo/changedisplay.c | 211 +-
demos/gtk-demo/clipboard.c | 2 +-
demos/gtk-demo/combobox.c | 190 +-
demos/gtk-demo/dialog.c | 74 +-
demos/gtk-demo/drawingarea.c | 4 +-
demos/gtk-demo/editable_cells.c | 18 +-
demos/gtk-demo/entry_buffer.c | 16 +-
demos/gtk-demo/entry_completion.c | 94 +-
demos/gtk-demo/expander.c | 18 +-
demos/gtk-demo/geninclude.pl.in | 2 +-
demos/gtk-demo/gtk-logo-24.png | Bin 0 -> 674 bytes
demos/gtk-demo/gtk-logo-48.png | Bin 0 -> 2405 bytes
demos/gtk-demo/hypertext.c | 102 +-
demos/gtk-demo/iconview.c | 241 +-
demos/gtk-demo/iconview_edit.c | 41 +-
demos/gtk-demo/images.c | 315 +-
demos/gtk-demo/infobar.c | 8 +-
demos/gtk-demo/links.c | 12 +-
demos/gtk-demo/list_store.c | 4 +-
demos/gtk-demo/main.c | 573 +-
demos/gtk-demo/menus.c | 28 +-
demos/gtk-demo/menus.ui | 107 +
demos/gtk-demo/offscreen_window.c | 1 -
demos/gtk-demo/offscreen_window2.c | 1 -
demos/gtk-demo/org.gtk.Demo.gschema.xml | 17 +
demos/gtk-demo/overlay.c | 2 +-
demos/gtk-demo/panes.c | 83 +-
demos/gtk-demo/pickers.c | 30 +-
demos/gtk-demo/pixbufs.c | 8 +-
demos/gtk-demo/printing.c | 30 +-
demos/gtk-demo/rotated_text.c | 6 +-
demos/gtk-demo/search_entry.c | 3 +-
demos/gtk-demo/sizegroup.c | 87 +-
demos/gtk-demo/spinner.c | 2 -
demos/gtk-demo/stock_browser.c | 129 +-
demos/gtk-demo/textscroll.c | 80 +-
demos/gtk-demo/textview.c | 9 +-
demos/gtk-demo/toolpalette.c | 2 +-
demos/gtk-demo/transparent.c | 248 +
demos/gtk-demo/tree_store.c | 184 +-
demos/gtk-demo/ui_manager.c | 109 +-
demos/widget-factory/Makefile.am | 31 +
demos/widget-factory/gtk-logo-256.png | Bin 0 -> 10688 bytes
demos/widget-factory/widget-factory.c | 101 +
demos/widget-factory/widget-factory.gresource.xml | 9 +
{tests => demos/widget-factory}/widget-factory.ui | 298 +-
docs/reference/gdk/Makefile.am | 5 +-
docs/reference/gdk/gdk-docs.sgml | 4 +
docs/reference/gdk/gdk3-sections.txt | 104 +
docs/reference/gtk/Makefile.am | 13 +-
docs/reference/gtk/compiling.sgml | 17 +-
docs/reference/gtk/gtk-docs.sgml | 11 +-
docs/reference/gtk/gtk3-sections.txt | 143 +-
docs/reference/gtk/gtk3.types | 5 +
docs/reference/gtk/images/bloatpad-gnome.png | Bin 0 -> 42936 bytes
docs/reference/gtk/images/bloatpad-osx.png | Bin 0 -> 25036 bytes
docs/reference/gtk/images/bloatpad-xfce.png | Bin 0 -> 53775 bytes
docs/reference/gtk/migrating-2to3.xml | 2 -
docs/reference/gtk/migrating-checklist.sgml | 4 +-
.../gtk/migrating-smclient-GtkApplication.xml | 48 +
...ion.xml => migrating-unique-GtkApplication.xml} | 12 +-
docs/reference/gtk/other_software.sgml | 4 +-
docs/reference/gtk/running.sgml | 2 +
docs/reference/gtk/windows.sgml | 6 +
docs/reference/libgail-util/Makefile.am | 2 +-
docs/tools/widgets.c | 3 +
examples/Makefile.am | 5 +-
examples/bloatpad.c | 317 +-
examples/drawing.c | 26 +-
examples/plugman.c | 468 ++
gail-3.0-uninstalled.pc.in | 11 -
gdk-3.0.pc.in | 1 +
gdk/Makefile.am | 2 +
gdk/broadway/broadway.c | 189 +-
gdk/broadway/broadway.h | 13 +-
gdk/broadway/broadway.js | 19 +-
gdk/broadway/gdkdisplay-broadway.c | 333 +-
gdk/broadway/gdkdisplaymanager-broadway.c | 14 -
gdk/broadway/gdkscreen-broadway.c | 1 +
gdk/broadway/gdkwindow-broadway.c | 6 +-
gdk/gdk.c | 39 +-
gdk/gdk.symbols | 9 +
gdk/gdkapplaunchcontext.c | 2 +
gdk/gdkapplaunchcontext.h | 6 +-
gdk/gdkcairo.c | 6 +
gdk/gdkcairo.h | 6 +-
gdk/gdkcolor.h | 2 +-
gdk/gdkconfig.h.win32 | 13 +
gdk/gdkcursor.h | 6 +-
gdk/gdkdeprecated.c | 107 +
gdk/gdkdevicemanager.c | 92 +-
gdk/gdkdisplay.c | 86 +-
gdk/gdkdisplay.h | 13 +-
gdk/gdkdisplaymanager.c | 3 +
gdk/gdkevents.c | 52 +-
gdk/gdkevents.h | 57 +-
gdk/gdkinternals.h | 20 +-
gdk/gdkkeys.c | 197 +
gdk/gdkkeys.h | 21 +-
gdk/gdkkeysprivate.h | 7 +
gdk/gdkmain.h | 23 +-
gdk/gdkoffscreenwindow.c | 9 +-
gdk/gdkpango.c | 5 +-
gdk/gdkrgba.c | 54 +-
gdk/gdkscreen.c | 44 +-
gdk/gdkscreen.h | 14 +-
gdk/gdkscreenprivate.h | 3 +
gdk/gdktypes.h | 38 +
gdk/gdkwindow.c | 687 ++-
gdk/gdkwindow.h | 54 +-
gdk/gdkwindowimpl.h | 20 +-
gdk/gen-keyname-table.pl | 37 +-
gdk/keynames-translate.txt | 28 +
gdk/quartz/GdkQuartzNSWindow.c | 5 +
gdk/quartz/gdkcursor-quartz.c | 4 +-
gdk/quartz/gdkdevice-core-quartz.c | 5 -
gdk/quartz/gdkdisplay-quartz.c | 3 +-
gdk/quartz/gdkdisplaymanager-quartz.c | 14 -
gdk/quartz/gdkeventloop-quartz.c | 58 +-
gdk/quartz/gdkevents-quartz.c | 326 +-
gdk/quartz/gdkglobals-quartz.c | 11 +-
gdk/quartz/gdkkeys-quartz.c | 167 +-
gdk/quartz/gdkscreen-quartz.c | 1 +
gdk/quartz/gdkwindow-quartz.c | 27 +-
gdk/tests/Makefile.am | 6 +-
gdk/tests/gdk-color.c | 102 -
gdk/tests/rgba.c | 164 +
gdk/wayland/gdkcursor-wayland.c | 70 +-
gdk/wayland/gdkdevice-wayland.c | 626 ++-
gdk/wayland/gdkdisplay-wayland.c | 97 +-
gdk/wayland/gdkdisplay-wayland.h | 2 +-
gdk/wayland/gdkdisplaymanager-wayland.c | 206 +-
gdk/wayland/gdkeventsource.c | 4 +-
gdk/wayland/gdkkeys-wayland.c | 8 +-
gdk/wayland/gdkprivate-wayland.h | 6 +-
gdk/wayland/gdkscreen-wayland.c | 45 +-
gdk/wayland/gdkwayland.h | 30 +
gdk/wayland/gdkwindow-wayland.c | 214 +-
gdk/win32/gdkdevice-win32.c | 132 +-
gdk/win32/gdkdevicemanager-win32.c | 11 +-
gdk/win32/gdkdisplay-win32.c | 203 +-
gdk/win32/gdkdisplaymanager-win32.c | 14 -
gdk/win32/gdkdnd-win32.c | 333 +-
gdk/win32/gdkevents-win32.c | 941 ++--
gdk/win32/gdkgeometry-win32.c | 15 +-
gdk/win32/gdkglobals-win32.c | 1 +
gdk/win32/gdkinput.c | 3 +
gdk/win32/gdkprivate-win32.h | 12 +-
gdk/win32/gdkscreen-win32.c | 3 +-
gdk/win32/gdkselection-win32.c | 19 +-
gdk/win32/gdkwin32.h | 1 +
gdk/win32/gdkwindow-win32.c | 496 ++-
gdk/win32/gdkwindow-win32.h | 7 +
gdk/x11/gdkapplaunchcontext-x11.c | 14 +-
gdk/x11/gdkcursor-x11.c | 2 +-
gdk/x11/gdkdevice-core-x11.c | 2 +-
gdk/x11/gdkdevice-xi.c | 2 +-
gdk/x11/gdkdevice-xi2.c | 7 +-
gdk/x11/gdkdevicemanager-core-x11.c | 233 +-
gdk/x11/gdkdevicemanager-x11.c | 4 +
gdk/x11/gdkdevicemanager-xi.c | 4 +-
gdk/x11/gdkdevicemanager-xi2.c | 143 +-
gdk/x11/gdkdevicemanagerprivate-core.h | 7 +
gdk/x11/gdkdisplay-x11.c | 48 +-
gdk/x11/gdkdisplay-x11.h | 2 +
gdk/x11/gdkdisplaymanager-x11.c | 2 +
gdk/x11/gdkdnd-x11.c | 13 +-
gdk/x11/gdkkeys-x11.c | 251 +-
gdk/x11/gdkprivate-x11.h | 2 +
gdk/x11/gdkscreen-x11.c | 227 +-
gdk/x11/gdksettings.c | 8 +-
gdk/x11/gdkwindow-x11.c | 347 +-
gdk/x11/gdkwindow-x11.h | 4 +
gdk/x11/gdkx11window.h | 5 +
gtk+-3.0-uninstalled.pc.in | 10 -
gtk+-3.0.pc.in | 3 +-
gtk+.doap | 1 +
gtk/Makefile.am | 293 +-
gtk/a11y/Makefile.am | 4 +-
gtk/a11y/gail.c | 9 +
gtk/a11y/gailutil.c | 36 +-
gtk/a11y/gailutil.h | 3 +
gtk/a11y/gtkbooleancellaccessible.c | 79 +-
gtk/a11y/gtkbooleancellaccessible.h | 1 -
gtk/a11y/gtkcellaccessible.c | 377 +-
gtk/a11y/gtkcellaccessible.h | 36 +-
gtk/a11y/gtkcellaccessibleparent.c | 78 +
gtk/a11y/gtkcellaccessibleparent.h | 23 +
gtk/a11y/gtkcomboboxaccessible.c | 4 +-
gtk/a11y/gtkcontaineraccessible.h | 1 +
gtk/a11y/gtkcontainercellaccessible.c | 79 +-
gtk/a11y/gtkentryaccessible.c | 56 +-
gtk/a11y/gtkentryaccessible.h | 4 -
gtk/a11y/gtkiconviewaccessible.c | 1549 ++++++
gtk/a11y/gtkiconviewaccessible.h | 57 +
gtk/a11y/gtkimagecellaccessible.c | 38 -
gtk/a11y/gtkimagecellaccessible.h | 1 -
gtk/a11y/gtkmenuaccessible.c | 1 +
gtk/a11y/gtkmenuaccessible.h | 1 +
gtk/a11y/gtknotebookaccessible.c | 15 +-
gtk/a11y/gtkrenderercellaccessible.c | 84 +-
gtk/a11y/gtkrenderercellaccessible.h | 7 +-
gtk/a11y/gtkscalebuttonaccessible.h | 1 -
gtk/a11y/gtktextcellaccessible.c | 111 +-
gtk/a11y/gtktextcellaccessible.h | 1 -
gtk/a11y/gtktextviewaccessible.c | 182 +-
gtk/a11y/gtktextviewaccessible.h | 6 +-
gtk/a11y/gtktoplevelaccessible.c | 6 +
gtk/a11y/gtktreeviewaccessible.c | 3622 ++++---------
gtk/a11y/gtktreeviewaccessible.h | 55 +-
gtk/a11y/gtkwidgetaccessible.c | 41 +-
gtk/a11y/gtkwidgetaccessible.h | 3 +-
gtk/a11y/gtkwindowaccessible.c | 6 +-
gtk/cursor_dnd_ask.png | Bin 0 -> 201 bytes
gtk/cursor_dnd_copy.png | Bin 0 -> 183 bytes
gtk/cursor_dnd_link.png | Bin 0 -> 216 bytes
gtk/cursor_dnd_move.png | Bin 0 -> 197 bytes
gtk/cursor_dnd_none.png | Bin 0 -> 144 bytes
gtk/{ => deprecated}/gtkfontsel.c | 9 +-
gtk/{ => deprecated}/gtkfontsel.h | 71 +-
gtk/{ => deprecated}/gtkhandlebox.c | 28 +
gtk/{ => deprecated}/gtkhandlebox.h | 10 +-
gtk/{ => deprecated}/gtkhbbox.c | 2 +-
gtk/{ => deprecated}/gtkhbbox.h | 5 +-
gtk/{ => deprecated}/gtkhbox.c | 7 +-
gtk/{ => deprecated}/gtkhbox.h | 5 +-
gtk/{ => deprecated}/gtkhpaned.c | 1 -
gtk/{ => deprecated}/gtkhpaned.h | 5 +-
gtk/{ => deprecated}/gtkhscale.c | 1 -
gtk/{ => deprecated}/gtkhscale.h | 8 +-
gtk/{ => deprecated}/gtkhscrollbar.c | 2 +-
gtk/{ => deprecated}/gtkhscrollbar.h | 8 +-
gtk/{ => deprecated}/gtkhseparator.c | 1 -
gtk/{ => deprecated}/gtkhseparator.h | 6 +-
gtk/{ => deprecated}/gtkrc.c | 17 +-
gtk/{ => deprecated}/gtkrc.h | 100 +-
gtk/{ => deprecated}/gtkstyle.c | 794 +++-
gtk/{ => deprecated}/gtkstyle.h | 553 +-
gtk/{ => deprecated}/gtktable.c | 49 +-
gtk/{ => deprecated}/gtktable.h | 18 +-
gtk/{ => deprecated}/gtktearoffmenuitem.c | 6 +
gtk/{ => deprecated}/gtktearoffmenuitem.h | 2 -
gtk/{ => deprecated}/gtkvbbox.c | 2 +-
gtk/{ => deprecated}/gtkvbbox.h | 6 -
gtk/{ => deprecated}/gtkvbox.c | 6 +-
gtk/{ => deprecated}/gtkvbox.h | 7 +-
gtk/{ => deprecated}/gtkvpaned.c | 2 +-
gtk/{ => deprecated}/gtkvpaned.h | 4 -
gtk/{ => deprecated}/gtkvscale.c | 1 -
gtk/{ => deprecated}/gtkvscale.h | 7 -
gtk/{ => deprecated}/gtkvscrollbar.c | 2 +-
gtk/{ => deprecated}/gtkvscrollbar.h | 7 -
gtk/{ => deprecated}/gtkvseparator.c | 2 +-
gtk/{ => deprecated}/gtkvseparator.h | 6 -
gtk/gactionmuxer.c | 495 ++
gtk/gactionmuxer.h | 53 +
gtk/gactionobservable.c | 80 +
gtk/gactionobservable.h | 64 +
gtk/gactionobserver.c | 161 +
gtk/gactionobserver.h | 90 +
gtk/gsimpleactionobserver.c | 288 +
gtk/gsimpleactionobserver.h | 53 +
gtk/gtk-default.css | 364 ++
gtk/gtk-win32.css | 825 +++
gtk/gtk.css.raleigh | 3 -
gtk/gtk.gresource.xml | 12 +
gtk/gtk.h | 41 +-
gtk/gtk.symbols | 74 +-
gtk/gtkaboutdialog.c | 84 +-
gtk/gtkaboutdialog.h | 3 +
gtk/gtkaccelgroup.c | 325 +-
gtk/gtkaccelgroup.h | 12 +
gtk/gtkaccellabel.c | 1 -
gtk/gtkaccelmap.c | 34 +-
gtk/gtkaccelmap.h | 10 -
gtk/gtkaccelmapprivate.h | 45 +
gtk/gtkaccessible.c | 134 +-
gtk/gtkaccessible.h | 6 +-
gtk/gtkaction.c | 5 +-
gtk/gtkactionable.c | 261 +
gtk/gtkactionable.h | 71 +
gtk/gtkactiongroup.c | 3 +-
gtk/gtkappchooser.c | 14 +
gtk/gtkappchooserbutton.c | 172 +-
gtk/gtkappchooserbutton.h | 3 +
gtk/gtkappchooserdialog.c | 47 +-
gtk/gtkappchooseronline.c | 3 +-
gtk/gtkappchooseronline.h | 2 +
gtk/gtkappchooseronlinepk.c | 4 +-
gtk/gtkappchooserwidget.c | 55 +-
gtk/gtkapplication.c | 1453 +++++-
gtk/gtkapplication.h | 65 +-
gtk/gtkapplicationprivate.h | 55 +
gtk/gtkapplicationwindow.c | 1046 ++++
gtk/gtkapplicationwindow.h | 70 +
gtk/gtkarrow.c | 40 +-
gtk/gtkassistant.c | 76 +-
gtk/gtkassistant.h | 6 +-
gtk/gtkbbox.c | 1 +
gtk/gtkbindings.c | 6 +-
gtk/gtkbindings.h | 3 +-
gtk/gtkbitmask.c | 279 +
gtk/gtkbitmaskprivate.h | 68 +
gtk/gtkborderimage.c | 257 +-
gtk/gtkborderimageprivate.h | 31 +-
gtk/gtkbox.c | 41 +-
gtk/gtkbox.h | 7 -
gtk/gtkboxprivate.h | 36 +
gtk/gtkbuilder-menus.c | 395 ++
gtk/gtkbuilder.c | 262 +-
gtk/gtkbuilder.h | 7 +
gtk/gtkbuilder.rnc | 86 +
gtk/gtkbuilder.rng | 305 +
gtk/gtkbuilderparser.c | 30 +-
gtk/gtkbuilderprivate.h | 19 +
gtk/gtkbutton.c | 240 +-
gtk/gtkbutton.h | 10 +-
gtk/gtkbuttonprivate.h | 5 +
gtk/gtkcalendar.c | 75 +-
gtk/gtkcellarea.c | 38 +-
gtk/gtkcelllayout.c | 4 +-
gtk/gtkcellrenderer.c | 100 +-
gtk/gtkcellrenderer.h | 31 +-
gtk/gtkcellrendereraccel.c | 49 +-
gtk/gtkcellrendererpixbuf.c | 463 +--
gtk/gtkcellrendererprogress.c | 2 +-
gtk/gtkcellrendererspin.c | 3 +-
gtk/gtkcellrendererspinner.c | 8 +
gtk/gtkcellrenderertext.c | 49 +-
gtk/gtkcellrenderertoggle.c | 11 +-
gtk/gtkcellview.c | 49 +-
gtk/gtkcellview.h | 8 +-
gtk/gtkcheckbutton.c | 20 +-
gtk/gtkcheckmenuitem.c | 12 +-
gtk/gtkclipboard-wayland.c | 877 +++
gtk/gtkclipboard.c | 2 +-
gtk/gtkcolorbutton.c | 41 +-
gtk/gtkcolorbutton.h | 14 +-
gtk/gtkcolorsel.c | 77 +-
gtk/gtkcolorsel.h | 22 +-
gtk/gtkcombobox.c | 446 +-
gtk/gtkcombobox.h | 5 +-
gtk/gtkcomboboxtext.c | 24 +-
gtk/gtkcontainer.c | 60 +-
gtk/gtkcontainerprivate.h | 1 +
gtk/gtkcsscomputedvalues.c | 271 +
gtk/gtkcsscomputedvaluesprivate.h | 78 +
gtk/gtkcsscustomproperty.c | 267 +
gtk/gtkcsscustompropertyprivate.h | 56 +
gtk/gtkcssimage.c | 387 ++
gtk/gtkcssimagegradient.c | 319 ++
gtk/gtkcssimagegradientprivate.h | 60 +
gtk/gtkcssimagelinear.c | 509 ++
gtk/gtkcssimagelinearprivate.h | 66 +
gtk/gtkcssimageprivate.h | 111 +
gtk/gtkcssimageurl.c | 191 +
gtk/gtkcssimageurlprivate.h | 54 +
gtk/gtkcssimagewin32.c | 234 +
gtk/gtkcssimagewin32private.h | 65 +
gtk/gtkcsslookup.c | 180 +
gtk/gtkcsslookupprivate.h | 55 +
gtk/gtkcssparser.c | 330 +-
gtk/gtkcssparserprivate.h | 26 +-
gtk/gtkcssprovider.c | 811 +--
gtk/gtkcsssection.c | 4 +-
gtk/gtkcssselector.c | 16 +-
gtk/gtkcssselectorprivate.h | 2 +-
gtk/gtkcssshorthandproperty.c | 202 +
gtk/gtkcssshorthandpropertyimpl.c | 983 ++++
gtk/gtkcssshorthandpropertyprivate.h | 82 +
gtk/gtkcssstylefuncs.c | 1366 +++++
gtk/gtkcssstylefuncsprivate.h | 39 +
gtk/gtkcssstyleproperty.c | 539 ++
gtk/gtkcssstylepropertyimpl.c | 1188 ++++
gtk/gtkcssstylepropertyprivate.h | 98 +
gtk/gtkcsstypes.c | 124 +-
gtk/gtkcsstypesprivate.h | 121 +-
gtk/gtkcustompaperunixdialog.c | 61 +-
gtk/gtkdialog.c | 11 +-
gtk/gtkdialog.h | 2 +-
gtk/gtkdnd-quartz.c | 129 +-
gtk/gtkdnd.c | 469 +-
gtk/gtkdndcursors.h | 347 --
gtk/gtkeditable.c | 4 +-
gtk/gtkentry.c | 860 +--
gtk/gtkentry.h | 2 +
gtk/gtkentrycompletion.c | 40 +-
gtk/gtkentrycompletion.h | 2 +
gtk/gtkentryprivate.h | 6 +-
gtk/gtkenums.h | 44 +-
gtk/gtkeventbox.c | 3 -
gtk/gtkexpander.c | 12 +-
gtk/gtkfilechooser.c | 4 +-
gtk/gtkfilechooserbutton.c | 13 +-
gtk/gtkfilechooserdefault.c | 166 +-
gtk/gtkfilechooserdialog.c | 2 +-
gtk/gtkfilechooserentry.c | 1793 ++-----
gtk/gtkfilechooserentry.h | 6 +-
gtk/gtkfilechooserprivate.h | 1 +
gtk/gtkfilesystem.c | 642 +---
gtk/gtkfilesystem.h | 57 -
gtk/gtkfilesystemmodel.c | 54 +-
gtk/gtkfilesystemmodel.h | 2 +
gtk/gtkfontbutton.c | 549 ++-
gtk/gtkfontchooser.c | 1294 +----
gtk/gtkfontchooser.h | 126 +-
gtk/gtkfontchooserdialog.c | 195 +-
gtk/gtkfontchooserdialog.h | 11 +-
gtk/gtkfontchooserprivate.h | 37 +
gtk/gtkfontchooserutils.c | 174 +
gtk/gtkfontchooserutils.h | 54 +
gtk/gtkfontchooserwidget.c | 1300 +++++
gtk/gtkfontchooserwidget.h | 71 +
gtk/gtkframe.c | 104 +-
gtk/gtkgradient.c | 39 +
gtk/gtkgradient.h | 5 +
gtk/gtkgrid.c | 219 +-
gtk/gtkhsv.c | 14 +-
gtk/gtkiconcache.c | 33 +-
gtk/gtkiconfactory.c | 11 +-
gtk/gtkiconfactory.h | 17 +-
gtk/gtkiconhelper.c | 567 ++
gtk/gtkiconhelperprivate.h | 131 +
gtk/gtkicontheme.c | 26 +-
gtk/gtkicontheme.h | 4 +-
gtk/gtkiconview.c | 2074 +-------
gtk/gtkiconviewprivate.h | 157 +
gtk/gtkimage.c | 970 +---
gtk/gtkimage.h | 3 +
gtk/gtkimagemenuitem.c | 15 +-
gtk/gtkimcontext.c | 2 +-
gtk/gtkimcontextinfo.h | 46 +
gtk/gtkimcontextsimple.c | 113 +-
gtk/gtkimmodule.c | 77 +-
gtk/gtkimmodule.h | 22 -
gtk/gtkimmoduleprivate.h | 36 +
gtk/gtkimmulticontext.c | 46 +-
gtk/gtkinfobar.c | 8 +-
gtk/gtkkeyhash.c | 37 +-
gtk/gtklabel.c | 551 +--
gtk/gtklayout.c | 67 +-
gtk/gtklayout.h | 11 +-
gtk/gtklinkbutton.c | 32 +-
gtk/gtkliststore.c | 38 +-
gtk/gtkmain.c | 258 +-
gtk/gtkmain.h | 2 +
gtk/gtkmainprivate.h | 37 -
gtk/gtkmarshalers.list | 1 +
gtk/gtkmenu.c | 119 +-
gtk/gtkmenu.h | 1 +
gtk/gtkmenubar.c | 4 -
gtk/gtkmenubar.h | 1 +
gtk/gtkmenuitem.c | 293 +-
gtk/gtkmenuitem.h | 4 +-
gtk/gtkmenushell.c | 8 +-
gtk/gtkmenutoolbutton.c | 4 +-
gtk/gtkmessagedialog.c | 34 +-
gtk/gtkmisc.c | 34 +
gtk/gtkmisc.h | 2 +
gtk/gtkmodelmenu.c | 392 ++
gtk/gtkmodelmenu.h | 40 +
gtk/gtkmodelmenuitem.c | 309 +
gtk/gtkmodelmenuitem.h | 45 +
gtk/gtkmodifierstyle.c | 72 +-
gtk/gtkmodifierstyle.h | 3 +-
gtk/gtkmodules.c | 56 +-
gtk/gtkmodules.h | 3 +-
gtk/{gtkvpaned.c => gtkmodulesprivate.h} | 56 +-
gtk/gtkmountoperation-x11.c | 69 +-
gtk/gtkmountoperation.c | 3 +-
gtk/gtknotebook.c | 391 +-
gtk/gtkoverlay.c | 79 +-
gtk/gtkpaned.c | 39 +-
gtk/gtkpango.c | 8 +-
gtk/gtkpapersize.c | 3 +-
gtk/gtkpathbar.c | 135 +-
gtk/gtkpathbar.h | 5 +-
gtk/gtkplug.c | 11 +-
gtk/gtkplug.h | 2 +-
gtk/gtkprintbackend.c | 1 +
gtk/gtkprintcontext.c | 2 +-
gtk/gtkprinteroptionwidget.c | 99 +-
gtk/gtkprintoperation-unix.c | 2 +-
gtk/gtkprintoperation-win32.c | 2 +-
gtk/gtkprintoperation.c | 27 +-
gtk/gtkprintsettings.c | 2 +-
gtk/gtkprintunixdialog.c | 11 +-
gtk/gtkprivate.c | 255 +
gtk/gtkprivate.h | 85 +-
gtk/gtkprivatetypebuiltins.c.template | 36 +
gtk/gtkprivatetypebuiltins.h.template | 28 +
gtk/gtkprogressbar.c | 54 +-
gtk/gtkquartz-menu.c | 631 +++
gtk/gtkquartz-menu.h | 30 +
gtk/gtkquartz.c | 94 +
gtk/gtkquartz.h | 4 +-
gtk/gtkquery.c | 3 +-
gtk/gtkradiobutton.c | 13 +-
gtk/gtkradiomenuitem.c | 11 +-
gtk/gtkradiotoolbutton.c | 26 +-
gtk/gtkrange.c | 243 +-
gtk/gtkrange.h | 4 +-
gtk/gtkrbtree.c | 933 ++--
gtk/gtkrbtree.h | 35 +-
gtk/gtkrc.key.mac | 135 +-
gtk/gtkrecentchooser.c | 5 +-
gtk/gtkrecentchooserdefault.c | 23 +-
gtk/gtkrecentchooserdialog.c | 34 +-
gtk/gtkrecentchoosermenu.c | 3 +-
gtk/gtkrecentchooserutils.c | 3 +-
gtk/gtkrecentmanager.c | 25 +-
gtk/gtkroundedbox.c | 363 +-
gtk/gtkroundedboxprivate.h | 16 +-
gtk/gtkscale.c | 199 +-
gtk/gtkscale.h | 3 +
gtk/gtkscalebutton.c | 4 +-
gtk/gtkscrolledwindow.c | 16 +-
gtk/gtksearchengine.c | 14 +-
gtk/gtksearchenginebeagle.c | 412 --
gtk/gtksearchenginebeagle.h | 59 -
gtk/gtksearchenginesimple.c | 15 +-
gtk/gtksearchenginetracker.c | 487 +-
gtk/gtkselection.c | 3 +-
gtk/gtkseparator.c | 5 -
gtk/gtksettings.c | 166 +-
gtk/gtksettings.h | 8 +-
gtk/gtkshadow.c | 15 +-
gtk/gtkshadowprivate.h | 4 +-
gtk/gtksizegroup.c | 2 +-
gtk/gtksizerequest.c | 1 +
gtk/gtksocket.c | 2 +-
gtk/gtkspinbutton.c | 838 ++--
gtk/gtkspinbutton.h | 4 +-
gtk/gtkspinner.c | 3 -
gtk/gtkstatusbar.c | 11 +-
gtk/gtkstatusicon.c | 456 +--
gtk/gtkstock.c | 65 +-
gtk/gtkstock.h | 4 +-
gtk/gtkstylecontext.c | 741 ++-
gtk/gtkstylecontext.h | 91 +-
gtk/gtkstylecontextprivate.h | 10 +-
gtk/gtkstyleproperties.c | 334 +-
gtk/gtkstyleproperties.h | 5 +-
gtk/gtkstylepropertiesprivate.h | 12 +-
gtk/gtkstyleproperty.c | 3108 +----------
gtk/gtkstylepropertyprivate.h | 108 +-
gtk/gtkstyleprovider.h | 8 +-
gtk/gtkstyleproviderprivate.c | 66 +
gtk/gtkstyleproviderprivate.h | 62 +
gtk/gtkswitch.c | 161 +-
gtk/gtksymboliccolor.c | 137 +-
gtk/gtksymboliccolor.h | 2 +
gtk/gtksymboliccolorprivate.h | 38 +
gtk/gtktestutils.c | 20 +-
gtk/gtktextattributes.c | 1 -
gtk/gtktextattributes.h | 2 +-
gtk/gtktextbtree.c | 8 +-
gtk/gtktextbuffer.c | 8 +-
gtk/gtktextbufferrichtext.c | 3 +-
gtk/gtktextbufferserialize.c | 14 +-
gtk/gtktextdisplay.c | 81 +-
gtk/gtktextlayout.c | 203 +-
gtk/gtktextlayout.h | 11 +-
gtk/gtktexttag.c | 23 +-
gtk/gtktextview.c | 52 +-
gtk/gtktextview.h | 4 +-
gtk/gtkthemingbackground.c | 387 ++
gtk/gtkthemingbackgroundprivate.h | 70 +
gtk/gtkthemingengine.c | 1016 ++--
gtk/gtkthemingengine.h | 1 +
gtk/gtkthemingengineprivate.h | 7 +
gtk/gtktimeline.c | 6 +
gtk/gtktogglebutton.c | 5 +-
gtk/gtktoolbar.c | 139 +-
gtk/gtktoolbutton.c | 78 +-
gtk/gtktoolitem.c | 1 -
gtk/gtktoolitemgroup.c | 1 +
gtk/gtktoolpalette.h | 5 +-
gtk/gtktoolshell.c | 52 +-
gtk/gtktooltip.c | 106 +-
gtk/gtktrayicon-x11.c | 11 +-
gtk/gtktreedatalist.c | 12 +-
gtk/gtktreemenu.c | 2 +-
gtk/gtktreemodel.c | 10 +-
gtk/gtktreemodelfilter.c | 418 ++-
gtk/gtktreeprivate.h | 7 +-
gtk/gtktreeselection.c | 41 +-
gtk/gtktreestore.c | 24 +-
gtk/gtktreeview.c | 1214 +++--
gtk/gtktreeview.h | 9 +-
gtk/gtktreeviewcolumn.c | 56 +-
gtk/gtkuimanager.c | 74 +-
gtk/gtkuimanager.h | 8 +-
gtk/gtkviewport.c | 75 +-
gtk/gtkviewport.h | 12 +-
gtk/gtkwidget.c | 1068 +---
gtk/gtkwidget.h | 77 +-
gtk/gtkwidgetpath.c | 3 +-
gtk/gtkwidgetprivate.h | 11 +
gtk/gtkwin32.c | 140 +
gtk/gtkwin32theme.c | 359 ++
gtk/gtkwin32themeprivate.h | 61 +
gtk/gtkwindow.c | 401 ++-
gtk/gtkwindow.h | 6 +
gtk/gtkwindowprivate.h | 3 +
gtk/queryimmodules.c | 8 +-
gtk/tests/Makefile.am | 24 +-
gtk/tests/accel.c | 125 +
gtk/tests/bitmask.c | 340 ++
gtk/tests/builder.c | 94 +-
gtk/tests/defaultvalue.c | 6 +-
gtk/tests/filechooser.c | 2 +-
gtk/tests/filtermodel.c | 1768 ++++++-
gtk/tests/grid.c | 238 +
gtk/tests/gtktreemodelrefcount.c | 7 +-
gtk/tests/object.c | 2 +-
gtk/tests/rbtree.c | 527 ++
gtk/tests/regression-tests.c | 70 +
gtk/tests/testing.c | 4 +-
gtk/tests/treeview-scrolling.c | 98 +-
gtk/updateiconcache.c | 11 +-
modules/engines/ms-windows/msw_style.c | 23 +-
modules/engines/pixbuf/pixbuf-rc-style.c | 3 +-
modules/input/Makefile.am | 6 +-
modules/input/gtkimcontextmultipress.c | 2 +-
modules/input/gtkimcontextxim.c | 2 +
modules/printbackends/cups/gtkcupsutils.c | 15 +-
modules/printbackends/cups/gtkprintbackendcups.c | 92 +-
modules/printbackends/cups/gtkprintercups.c | 2 +
modules/printbackends/papi/gtkprintbackendpapi.c | 4 +-
modules/printbackends/test/gtkprintbackendtest.c | 6 +-
po-properties/POTFILES.in | 32 +-
po-properties/POTFILES.skip | 21 +-
po-properties/as.po | 3928 ++++++-------
po-properties/ast.po | 5129 ++++++++++--------
po-properties/bg.po | 3149 ++++++-----
po-properties/ca.po | 3183 ++++++-----
po-properties/ca valencia po | 2425 +++++----
po-properties/cs.po | 3205 ++++++-----
po-properties/da.po | 3193 ++++++-----
po-properties/de.po | 1331 +++---
po-properties/en_GB.po | 3172 ++++++-----
po-properties/es.po | 3301 ++++++------
po-properties/eu.po | 3801 +++++++------
po-properties/fi.po | 5208 +++++++++++-------
po-properties/fr.po | 3125 ++++++-----
po-properties/gl.po | 3438 ++++++------
po-properties/he.po | 4699 ++++++++--------
po-properties/hu.po | 3160 ++++++-----
po-properties/id.po | 1406 ++---
po-properties/it.po | 5667 +++++++++++--------
po-properties/ko.po | 3181 ++++++-----
po-properties/lt.po | 2367 ++++-----
po-properties/lv.po | 3706 ++++---------
po-properties/nb.po | 3659 +++++++------
po-properties/or.po | 5440 +++++++++++--------
po-properties/pa.po | 765 ++--
po-properties/pl.po | 3183 ++++++-----
po-properties/pt.po | 2944 ++++++-----
po-properties/pt_BR.po | 3194 ++++++-----
po-properties/ru.po | 810 ++--
po-properties/sl.po | 2099 ++++----
po-properties/sr.po | 3198 ++++++-----
po-properties/sr latin po | 3196 ++++++-----
po-properties/sv.po | 3217 ++++++-----
po-properties/ta.po | 5391 +++++++++++--------
po-properties/te.po | 5876 +++++++++++---------
po-properties/zh_CN.po | 3206 ++++++-----
po-properties/zh_HK.po | 3773 ++++++-------
po-properties/zh_TW.po | 3751 ++++++-------
po/POTFILES.in | 32 +-
po/POTFILES.skip | 21 +-
po/ar.po | 1478 +++---
po/as.po | 2573 ++-------
po/be.po | 887 ++--
po/bg.po | 548 +-
po/br.po | 2466 +++++----
po/ca.po | 1308 +++--
po/ca valencia po | 939 ++--
po/cs.po | 1052 ++--
po/da.po | 1051 ++--
po/de.po | 823 ++--
po/en_GB.po | 1050 ++--
po/eo.po | 933 ++--
po/es.po | 1210 ++--
po/et.po | 561 ++-
po/eu.po | 1503 +++--
po/fa.po | 532 +-
po/fi.po | 2468 +++++----
po/fr.po | 1219 ++---
po/gl.po | 1558 +++---
po/he.po | 1428 +++---
po/hu.po | 1083 ++--
po/id.po | 661 +--
po/it.po | 783 ++--
po/ja.po | 2132 +++-----
po/kk.po | 1837 ++++---
po/ko.po | 1016 ++--
po/lt.po | 824 ++--
po/lv.po | 849 ++--
po/nb.po | 1168 ++--
po/nl.po | 2137 +++-----
po/pa.po | 570 +-
po/pl.po | 791 ++--
po/pt.po | 1056 ++--
po/pt_BR.po | 802 ++--
po/ru.po | 1496 +++---
po/sk.po | 2674 ++++++----
po/sl.po | 2021 +++-----
po/sr.po | 605 +-
po/sr latin po | 605 +-
po/sv.po | 483 +-
po/ta.po | 2484 +++++----
po/te.po | 3085 +++++------
po/vi.po | 1211 +++--
po/zh_CN.po | 1050 ++--
po/zh_HK.po | 2982 ++--------
po/zh_TW.po | 2958 ++--------
tests/Makefile.am | 32 +-
tests/a11y/Makefile.am | 16 +-
tests/a11y/about.txt | 9 +-
tests/a11y/accessibility-dump.c | 46 +-
tests/a11y/appchooser.txt | 407 --
tests/a11y/appchooser.ui | 6 -
tests/a11y/children.c | 2 +
tests/a11y/combos.txt | 227 +
tests/a11y/combos.ui | 42 +
tests/a11y/entries.txt | 88 +-
tests/a11y/entries.ui | 16 +
tests/a11y/iconview.txt | 4 +-
tests/a11y/pickers.txt | 12 +-
tests/a11y/testfocus.c | 2 +-
tests/a11y/text.c | 550 ++-
tests/a11y/tree-performance.c | 10 +-
tests/a11y/tree-relationships.c | 384 ++
tests/a11y/tree.txt | 408 --
tests/a11y/tree.ui | 50 -
tests/css/parser/Makefile.am | 22 +
tests/css/parser/at-invalid-02.errors | 1 +
tests/css/parser/background-repeat.css | 87 +
tests/css/parser/background-repeat.ref.css | 87 +
tests/css/parser/background-shorthand.css | 1300 +++++
tests/css/parser/background-shorthand.ref.css | 2599 +++++++++
tests/css/parser/background-size.css | 51 +
tests/css/parser/background-size.ref.css | 51 +
tests/css/parser/border-color-currentcolor.css | 3 +
tests/css/parser/border-color-currentcolor.ref.css | 6 +
tests/css/parser/border-radius.css | 56 +-
tests/css/parser/border-radius.errors | 2 +-
tests/css/parser/border-radius.ref.css | 117 +-
tests/css/parser/border-shorthand.css | 345 ++
tests/css/parser/border-shorthand.ref.css | 771 +++
tests/css/parser/border.css | 4 -
tests/css/parser/border.ref.css | 4 -
tests/css/parser/declarations-valid-04.ref.css | 4 +-
tests/css/parser/declarations-valid-10.css | 2 +-
tests/css/parser/declarations-valid-10.ref.css | 8 +-
tests/css/parser/declarations-valid-11.css | 2 +-
tests/css/parser/declarations-valid-11.ref.css | 8 +-
tests/css/parser/declarations-valid-12.css | 2 +-
tests/css/parser/declarations-valid-12.ref.css | 8 +-
tests/css/parser/declarations-valid-13.css | 2 +-
tests/css/parser/declarations-valid-13.ref.css | 8 +-
tests/css/parser/declarations-valid-14.css | 2 +-
tests/css/parser/declarations-valid-14.ref.css | 8 +-
tests/css/parser/declarations-valid-15.css | 2 +-
tests/css/parser/declarations-valid-15.ref.css | 8 +-
tests/css/parser/declarations-valid-16.css | 2 +-
tests/css/parser/declarations-valid-16.ref.css | 16 +-
tests/css/parser/declarations-valid-22.ref.css | 2 +-
tests/css/parser/declarations-valid-23.ref.css | 2 +-
tests/css/parser/declarations-valid-26.css | 1 +
tests/css/parser/declarations-valid-26.ref.css | 4 +
tests/css/parser/font-family.ref.css | 2 +-
tests/css/parser/linear-gradient.css | 104 +
tests/css/parser/linear-gradient.ref.css | 104 +
tests/css/parser/shorthand.css | 2 +-
tests/css/parser/shorthand.ref.css | 8 +-
tests/css/parser/value-inherit-shorthand.css | 9 +
tests/css/parser/value-inherit-shorthand.ref.css | 31 +
tests/css/parser/value-inherit.css | 45 +
tests/css/parser/value-initial-shorthand.css | 9 +
tests/css/parser/value-initial-shorthand.ref.css | 31 +
tests/css/parser/value-initial.css | 45 +
tests/css/parser/value-none.css | 45 +
tests/css/parser/value-none.errors | 32 +
tests/css/parser/value-none.ref.css | 13 +
tests/print-editor.c | 28 +-
tests/prop-editor.c | 207 +-
tests/reftests/Makefile.am | 42 +
tests/reftests/background-area.css | 46 +-
tests/reftests/background-area.ref.ui | 54 +-
tests/reftests/background-area.ui | 44 +-
tests/reftests/background-color-transparent.css | 4 +
tests/reftests/background-color-transparent.ref.ui | 46 +
tests/reftests/background-color-transparent.ui | 46 +
tests/reftests/background-origin.css | 58 +
tests/reftests/background-origin.ref.ui | 19 +
tests/reftests/background-origin.ui | 116 +
.../background-positioning-area-empty.ref.ui | 17 +
.../reftests/background-positioning-area-empty.ui | 17 +
tests/reftests/background-repeat.css | 30 +
tests/reftests/background-repeat.ref.ui | 84 +
tests/reftests/background-repeat.ui | 70 +
tests/reftests/background-size-keywords.css | 112 +
tests/reftests/background-size-keywords.ref.ui | 243 +
tests/reftests/background-size-keywords.ui | 242 +
tests/reftests/background-size.css | 61 +
tests/reftests/background-size.ref.ui | 243 +
tests/reftests/background-size.ui | 242 +
tests/reftests/background-window-transparent.css | 5 +
.../reftests/background-window-transparent.ref.ui | 15 +
tests/reftests/background-window-transparent.ui | 14 +
tests/reftests/border-color-default.css | 2 +-
tests/reftests/border-image-excess-size.css | 2 +-
tests/reftests/border-image-gradient.css | 16 +-
tests/reftests/border-image-repeat.css | 17 +-
tests/reftests/border-image-url.css | 12 +-
tests/reftests/border-radius-clamp.css | 4 +-
tests/reftests/border-style-none.css | 19 +
tests/reftests/border-style-none.ref.ui | 19 +
tests/reftests/border-style-none.ui | 18 +
tests/reftests/border-style.css | 27 +
tests/reftests/border-style.ref.ui | 33 +
tests/reftests/border-style.ui | 90 +
tests/reftests/box-shadow-spec-inset.css | 14 +-
tests/reftests/css-match-class.css | 2 +
tests/reftests/css-match-exact.css | 8 +-
.../reftests/css-match-inherit-different-state.css | 12 +
.../css-match-inherit-different-state.ref.ui | 26 +
.../reftests/css-match-inherit-different-state.ui | 25 +
tests/reftests/css-match-inherit.css | 1 +
tests/reftests/css-match-name.css | 2 +
tests/reftests/css-match-region-matches-star.css | 2 +
tests/reftests/css-match-regions.css | 2 +
tests/reftests/css-match-style-property-order.css | 2 +-
tests/reftests/css-match-subtype.css | 2 +
tests/reftests/css-match-type.css | 2 +
tests/reftests/css-multi-state.css | 9 +
tests/reftests/css-multi-state.ref.ui | 27 +
tests/reftests/css-multi-state.ui | 26 +
tests/reftests/entry-progress-coloring.css | 6 +-
tests/reftests/grid-empty-with-spacing.ref.ui | 16 +
tests/reftests/grid-empty-with-spacing.ui | 28 +
tests/reftests/grid-spacing1.ui | 2 +-
tests/reftests/grid-spacing2.ui | 2 +-
tests/reftests/gtk-reftest.c | 8 +-
tests/reftests/inherit-and-initial.css | 85 +
.../inherit-and-initial.ref.ui} | 443 ++-
.../inherit-and-initial.ui} | 286 +-
tests/reftests/label-attribute-preference.css | 4 +
tests/reftests/label-attribute-preference.ref.ui | 24 +
tests/reftests/label-attribute-preference.ui | 20 +
tests/reftests/linear-gradient.css | 35 +
tests/reftests/linear-gradient.ref.ui | 67 +
tests/reftests/linear-gradient.ui | 66 +
tests/reftests/no-colors.css | 8 +-
tests/reftests/reference-background-origin.png | Bin 0 -> 2024 bytes
tests/reftests/reset-to-defaults.css | 59 +
tests/reftests/shorthand-entry-border.css | 10 +-
tests/reftests/style-properties-only-child.css | 9 +
tests/reftests/style-properties-only-child.ref.ui | 32 +
tests/reftests/style-properties-only-child.ui | 32 +
tests/reftests/unresolvable.css | 6 +-
tests/testaccel.c | 4 +-
tests/testadjustsize.c | 44 +-
tests/testappchooser.c | 10 +-
tests/testappchooserbutton.c | 5 +-
tests/testcombo.c | 9 +-
tests/testdnd.c | 44 +-
tests/testentryicons.c | 60 +-
tests/testexpand.c | 58 +-
tests/testfontchooser.c | 44 +-
tests/testfontchooserdialog.c | 69 +-
tests/testfontselection.c | 2 +-
tests/testfontselectiondialog.c | 2 +-
tests/testframe.c | 22 +-
tests/testgeometry.c | 34 +-
tests/testgmenu.c | 1042 ++++
tests/testgtk.c | 722 +--
tests/testiconview.c | 3 +-
tests/testimage.c | 42 +-
tests/testlogout.c | 201 +
tests/testmerge.c | 50 +-
tests/testnotebookdnd.c | 38 +-
tests/testoffscreen.c | 5 +-
tests/testorientable.c | 19 +-
tests/testscale.c | 217 +-
tests/testselection.c | 22 +-
tests/testtoolbar.c | 49 +-
tests/testtreechanging.c | 522 ++
tests/testtreeview.c | 30 +-
tests/testvolumebutton.c | 2 +-
tests/testwindows.c | 230 +-
tests/visuals/Makefile.am | 28 +
tests/visuals/inline-toolbar.ui | 120 +
tests/visuals/primary-toolbar.ui | 211 +
tests/visuals/visuals.c | 86 +
tests/widget-factory.c | 67 -
937 files changed, 160860 insertions(+), 124934 deletions(-)
---
diff --cc gtk/gtkbuilder.c
index 8fb8113,1f9d6e4..cc6092e
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@@ -63,38 -63,11 +63,46 @@@
* <link linkend="XML-UI">GtkUIManager UI Definitions</link>, which are more
* limited in scope.
* </para>
++<<<<<<< HEAD
+ * <programlisting><![CDATA[
+ * <!ELEMENT interface (requires|object)* >
+ * <!ELEMENT object (property|signal|child|binding|ANY)* >
+ * <!ELEMENT property PCDATA >
+ * <!ELEMENT signal EMPTY >
+ * <!ELEMENT binding EMPTY >
+ * <!ELEMENT requires EMPTY >
+ * <!ELEMENT child (object|ANY*) >
+ *
+ * <!ATTLIST interface domain #IMPLIED >
+ * <!ATTLIST object id #REQUIRED
+ * class #REQUIRED
+ * type-func #IMPLIED
+ * constructor #IMPLIED >
+ * <!ATTLIST requires lib #REQUIRED
+ * version #REQUIRED >
+ * <!ATTLIST property name #REQUIRED
+ * translatable #IMPLIED
+ * comments #IMPLIED
+ * context #IMPLIED >
+ * <!ATTLIST signal name #REQUIRED
+ * handler #REQUIRED
+ * after #IMPLIED
+ * swapped #IMPLIED
+ * object #IMPLIED
+ * last_modification_time #IMPLIED >
+ * <!ATTLIST child type #IMPLIED
+ * internal-child #IMPLIED >
+ * <!ATTLIST binding to #REQUIRED
+ * from #REQUIRED
+ * source #REQUIRED>
+ * ]]></programlisting>
++=======
+ * <programlisting>
+ * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; parse="text" href="../../../../gtk/gtkbuilder.rnc">
+ * <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+ * </xi:include>
+ * </programlisting>
++>>>>>>> master
* <para>
* The toplevel element is <interface>. It optionally takes a "domain"
* attribute, which will make the builder look for translated strings using
@@@ -296,8 -272,8 +314,9 @@@ struct _GtkBuilderPrivat
GHashTable *objects;
GSList *delayed_properties;
GSList *signals;
+ GSList *bindings;
gchar *filename;
+ gchar *resource_prefix;
};
G_DEFINE_TYPE (GtkBuilder, gtk_builder, G_TYPE_OBJECT)
diff --cc gtk/tests/builder.c
index 9dd3083,a5889fb..5c7d6a2
--- a/gtk/tests/builder.c
+++ b/gtk/tests/builder.c
@@@ -2573,71 -2573,78 +2573,126 @@@ test_message_area (void
}
static void
+ test_gmenu (void)
+ {
+ GtkBuilder *builder;
+ GObject *obj, *obj1;
+ const gchar buffer[] =
+ "<interface>"
+ " <object class=\"GtkWindow\" id=\"window\">"
+ " </object>"
+ " <menu id='edit-menu'>"
+ " <section>"
+ " <item>"
+ " <attribute name='label'>Undo</attribute>"
+ " <attribute name='action'>undo</attribute>"
+ " </item>"
+ " <item>"
+ " <attribute name='label'>Redo</attribute>"
+ " <attribute name='action'>redo</attribute>"
+ " </item>"
+ " </section>"
+ " <section></section>"
+ " <section>"
+ " <attribute name='label'>Copy & Paste</attribute>"
+ " <item>"
+ " <attribute name='label'>Cut</attribute>"
+ " <attribute name='action'>cut</attribute>"
+ " </item>"
+ " <item>"
+ " <attribute name='label'>Copy</attribute>"
+ " <attribute name='action'>copy</attribute>"
+ " </item>"
+ " <item>"
+ " <attribute name='label'>Paste</attribute>"
+ " <attribute name='action'>paste</attribute>"
+ " </item>"
+ " </section>"
+ " <item><link name='section' id='blargh'>"
+ " <item>"
+ " <attribute name='label'>Bold</attribute>"
+ " <attribute name='action'>bold</attribute>"
+ " </item>"
+ " <submenu>"
+ " <attribute name='label'>Language</attribute>"
+ " <item>"
+ " <attribute name='label'>Latin</attribute>"
+ " <attribute name='action'>lang</attribute>"
+ " <attribute name='target'>'latin'</attribute>"
+ " </item>"
+ " <item>"
+ " <attribute name='label'>Greek</attribute>"
+ " <attribute name='action'>lang</attribute>"
+ " <attribute name='target'>'greek'</attribute>"
+ " </item>"
+ " <item>"
+ " <attribute name='label'>Urdu</attribute>"
+ " <attribute name='action'>lang</attribute>"
+ " <attribute name='target'>'urdu'</attribute>"
+ " </item>"
+ " </submenu>"
+ " </link></item>"
+ " </menu>"
+ "</interface>";
+
+ builder = builder_new_from_string (buffer, -1, NULL);
+ obj = gtk_builder_get_object (builder, "window");
+ g_assert (GTK_IS_WINDOW (obj));
+ obj1 = gtk_builder_get_object (builder, "edit-menu");
+ g_assert (G_IS_MENU_MODEL (obj1));
+ obj1 = gtk_builder_get_object (builder, "blargh");
+ g_assert (G_IS_MENU_MODEL (obj1));
+ g_object_unref (builder);
+ }
+
++static void
+test_property_bindings (void)
+{
+ const gchar *buffer =
+ "<interface>"
+ " <object class=\"GtkWindow\" id=\"window\">"
+ " <child>"
+ " <object class=\"GtkVBox\" id=\"vbox\">"
+ " <property name=\"visible\">True</property>"
+ " <property name=\"orientation\">vertical</property>"
+ " <child>"
+ " <object class=\"GtkCheckButton\" id=\"checkbutton\">"
+ " <property name=\"active\">false</property>"
+ " </object>"
+ " </child>"
+ " <child>"
+ " <object class=\"GtkButton\" id=\"button\">"
+ " <binding to=\"sensitive\" from=\"active\" source=\"checkbutton\"/>"
+ " </object>"
+ " </child>"
+ " </object>"
+ " </child>"
+ " </object>"
+ "</interface>";
+
+ GtkBuilder *builder;
+ GObject *checkbutton, *button, *window;
+
+ builder = builder_new_from_string (buffer, -1, NULL);
+
+ checkbutton = gtk_builder_get_object (builder, "checkbutton");
+ g_assert (checkbutton != NULL);
+ g_assert (GTK_IS_CHECK_BUTTON (checkbutton));
+ g_assert (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)));
+
+ button = gtk_builder_get_object (builder, "button");
+ g_assert (button != NULL);
+ g_assert (GTK_IS_BUTTON (button));
+ g_assert (!gtk_widget_get_sensitive (GTK_WIDGET (button)));
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), TRUE);
+ g_assert (gtk_widget_get_sensitive (GTK_WIDGET (button)));
+
+ window = gtk_builder_get_object (builder, "window");
+ gtk_widget_destroy (GTK_WIDGET (window));
+ g_object_unref (builder);
+}
+
- gboolean
- reverse_func (GBinding *binding,
- const GValue *source_value,
- GValue *target_value,
- gpointer user_data)
- {
- gchar *tmp;
-
- g_assert_cmpstr ((const gchar *)user_data, ==, "user_data");
-
- tmp = g_strdup (g_value_get_string (source_value));
- g_strreverse (tmp);
- g_value_set_string (target_value, tmp);
- g_free (tmp);
-
- return TRUE;
- }
-
int
main (int argc, char **argv)
{
@@@ -2684,7 -2691,7 +2739,8 @@@
g_test_add_func ("/Builder/Menus", test_menus);
g_test_add_func ("/Builder/MessageArea", test_message_area);
g_test_add_func ("/Builder/MessageDialog", test_message_dialog);
+ g_test_add_func ("/Builder/GMenu", test_gmenu);
+ g_test_add_func ("/Builder/Property Bindings", test_property_bindings);
return g_test_run();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
