[gtk+/quartz-integration: 173/264] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 173/264] Merge branch 'master' into quartz-integration
- Date: Thu, 6 Jan 2011 22:25:00 +0000 (UTC)
commit 5253668480bdcd1623a490077f8e4794ead307f7
Merge: 8caf720 e608cc4
Author: John Ralls <jralls ceridwen us>
Date: Tue Jan 4 23:21:11 2011 -0800
Merge branch 'master' into quartz-integration
NEWS | 97 +
configure.ac | 95 +-
docs/reference/gtk/gtk3-sections.txt | 17 +-
docs/reference/gtk/running.sgml | 13 +
docs/reference/gtk/tmpl/.gitignore | 7 +
docs/reference/gtk/tmpl/gtkdialog.sgml | 406 --
docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 140 -
docs/reference/gtk/tmpl/gtkentrycompletion.sgml | 377 -
docs/reference/gtk/tmpl/gtkeventbox.sgml | 86 -
docs/reference/gtk/tmpl/gtkexpander.sgml | 296 -
docs/reference/gtk/tmpl/gtkfeatures.sgml | 135 -
docs/reference/gtk/tmpl/gtkmain.sgml | 626 --
gdk/Makefile.am | 1 +
gdk/abicheck.sh | 2 +-
gdk/tests/encoding.c | 2 +-
gdk/x11/gdkdnd-x11.c | 56 +-
gtk/Makefile.am | 5 +-
gtk/compose-parse.py | 12 +-
gtk/gtk.h | 2 +-
gtk/gtk.symbols | 19 +-
gtk/gtkaboutdialog.c | 5 +-
gtk/gtkaccelgroup.c | 7 +-
gtk/gtkaccellabel.c | 2 -
gtk/gtkactiongroup.h | 2 +-
gtk/gtkactivatable.c | 1 -
gtk/gtkactivatable.h | 1 -
gtk/gtkarrow.c | 2 +-
gtk/gtkassistant.c | 2 +-
gtk/gtkbbox.c | 2 +-
gtk/gtkbindings.c | 656 +-
gtk/gtkbox.c | 2 +-
gtk/gtkbuildable.c | 1 -
gtk/gtkbuildable.h | 1 -
gtk/gtkbuilderparser.c | 3 +-
gtk/gtkbutton.c | 1 +
gtk/gtkcalendar.c | 25 +-
gtk/gtkcellareabox.c | 1 +
gtk/gtkcelllayout.c | 137 +-
gtk/gtkcellrenderer.c | 1 +
gtk/gtkcellrendereraccel.c | 3 +-
gtk/gtkcellrendererspin.c | 2 +-
gtk/gtkcellrendererspinner.c | 2 +-
gtk/gtkcellview.c | 1338 ++--
gtk/gtkcellview.h | 40 +-
gtk/gtkcolorbutton.c | 3 +-
gtk/gtkcombobox.c | 3183 +++------
gtk/gtkcombobox.h | 20 +-
gtk/gtkcomboboxtext.c | 10 +-
gtk/gtkcontainer.c | 6 +-
gtk/gtkcssprovider.c | 3 +-
gtk/gtkdialog.c | 139 +-
gtk/gtkdialog.h | 83 +-
gtk/gtkdrawingarea.c | 116 +-
gtk/gtkdrawingarea.h | 4 +-
gtk/gtkentry.c | 2 +-
gtk/gtkentrycompletion.c | 566 +-
gtk/gtkentrycompletion.h | 23 +-
gtk/gtkeventbox.c | 266 +-
gtk/gtkeventbox.h | 16 +-
gtk/gtkexpander.c | 791 ++-
gtk/gtkfilechooserbutton.c | 1 +
gtk/gtkfilechooserdefault.c | 1 -
gtk/gtkfilechooserentry.c | 2 -
gtk/gtkfontsel.c | 5 +-
gtk/gtkframe.c | 1 +
gtk/gtkhandlebox.c | 3 +
gtk/gtkhsv.c | 4 +-
gtk/gtkiconfactory.c | 4 +-
gtk/gtkiconview.c | 4 +-
gtk/gtkimage.c | 2 +
gtk/gtkimcontext.c | 2 +-
gtk/gtkimcontextsimple.c | 80 +-
gtk/gtkimcontextsimpleseqs.h | 8824 +++++++++++-----------
gtk/gtkimmodule.c | 2 +-
gtk/gtkinfobar.c | 2 +-
gtk/gtklabel.c | 4 +-
gtk/gtklinkbutton.c | 8 +-
gtk/gtkmain.c | 1361 ++--
gtk/gtkmain.h | 135 +-
gtk/gtkmainprivate.h | 35 +
gtk/gtkmenu.c | 24 +-
gtk/gtkmenubar.c | 4 +-
gtk/gtkmenuitem.c | 109 +-
gtk/gtkmenuitem.h | 3 +
gtk/gtkmenuitemprivate.h | 10 +-
gtk/gtkmenushell.c | 5 +-
gtk/gtkmessagedialog.c | 2 +
gtk/gtkmodules.c | 2 +-
gtk/gtkmodules.h | 36 +-
gtk/gtknotebook.c | 4425 ++++++------
gtk/gtkorientable.c | 2 +-
gtk/gtkpaned.c | 3 +-
gtk/gtkprintoperation.c | 9 +-
gtk/gtkprintsettings.c | 6 +-
gtk/gtkprintunixdialog.c | 21 +-
gtk/gtkprivate.h | 22 +-
gtk/gtkrange.c | 4 +-
gtk/gtkscale.c | 2 +-
gtk/gtkscalebutton.c | 5 +-
gtk/gtkscrollable.c | 2 +-
gtk/gtkscrolledwindow.c | 5 +-
gtk/gtksettings.c | 2 +-
gtk/gtkshow.c | 11 +-
gtk/gtksizegroup.c | 1 +
gtk/gtksocket-x11.c | 2 +-
gtk/gtksocket.c | 3 +-
gtk/gtkspinbutton.c | 6 +-
gtk/gtkstatusbar.c | 2 +
gtk/gtkstatusicon.c | 23 +-
gtk/gtkstock.c | 2 +-
gtk/gtkstock.h | 15 +-
gtk/gtkswitch.c | 2 -
gtk/gtktexttag.c | 10 +-
gtk/gtktextview.c | 15 +-
gtk/gtktoolbar.c | 7 +-
gtk/gtktoolitem.c | 2 +-
gtk/gtktoolitemgroup.c | 6 +-
gtk/gtktoolpalette.c | 2 +-
gtk/gtktrayicon-x11.c | 10 +-
gtk/gtktreemenu.c | 2028 ++++++
gtk/gtktreemenu.h | 128 +
gtk/gtktreesortable.h | 1 -
gtk/gtktreeview.c | 5 +-
gtk/gtktreeviewcolumn.c | 1 +
gtk/gtktypeutils.c | 47 -
gtk/gtktypeutils.h | 130 -
gtk/gtkversion.h.in | 75 +-
gtk/gtkviewport.c | 2 +-
gtk/gtkwidget.c | 14 +-
gtk/gtkwindow.c | 7 +-
modules/other/gail/gailbox.c | 22 -
modules/other/gail/gailpaned.c | 24 -
modules/other/gail/gailrange.c | 35 +-
modules/other/gail/gailseparator.c | 22 -
modules/other/gail/gailwidget.c | 23 +
po-properties/POTFILES.in | 1 -
po/POTFILES.in | 1 -
tests/Makefile.am | 9 +-
tests/testcombo.c | 92 +-
tests/testnotebookdnd.c | 100 +-
tests/testtreemenu.c | 556 ++
141 files changed, 14232 insertions(+), 14255 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
