[gtk+/scrollable: 18/20] Merge branch 'master' into scrollable
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/scrollable: 18/20] Merge branch 'master' into scrollable
- Date: Tue, 19 Oct 2010 15:49:18 +0000 (UTC)
commit 781c07ee4447666850443cea93e2a999549bc7fe
Merge: d850ee0 04900c8
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Tue Oct 19 22:45:53 2010 +0900
Merge branch 'master' into scrollable
configure.ac | 2 +-
demos/gtk-demo/combobox.c | 19 +-
docs/reference/gdk/tmpl/drawing.sgml | 46 --
docs/reference/gdk/tmpl/gdkscreen.sgml | 36 -
docs/reference/gdk/tmpl/general.sgml | 18 +-
docs/reference/gdk/tmpl/pango_interaction.sgml | 8 +-
docs/reference/gdk/tmpl/x_interaction.sgml | 4 +-
docs/reference/gtk/gtk3-sections.txt | 1 +
docs/reference/gtk/tmpl/gtkcellrenderer.sgml | 97 +++-
.../gtk/tmpl/gtkcellrendererprogress.sgml | 2 +-
docs/reference/gtk/tmpl/gtkcellrenderertext.sgml | 5 +
docs/reference/gtk/tmpl/gtkdnd.sgml | 31 +-
docs/reference/gtk/tmpl/gtkentry.sgml | 5 -
docs/reference/gtk/tmpl/gtkenums.sgml | 50 --
docs/reference/gtk/tmpl/gtkfeatures.sgml | 45 ++
docs/reference/gtk/tmpl/gtkframe.sgml | 5 -
docs/reference/gtk/tmpl/gtkhandlebox.sgml | 5 -
docs/reference/gtk/tmpl/gtkmain.sgml | 33 +-
docs/reference/gtk/tmpl/gtkmenu.sgml | 1 +
docs/reference/gtk/tmpl/gtkmenuitem.sgml | 14 +
docs/reference/gtk/tmpl/gtkprogressbar.sgml | 4 +-
docs/reference/gtk/tmpl/gtkradiomenuitem.sgml | 4 +-
docs/reference/gtk/tmpl/gtkselection.sgml | 28 +
docs/reference/gtk/tmpl/gtkstatusicon.sgml | 23 -
docs/reference/gtk/tmpl/gtktextview.sgml | 9 -
docs/reference/gtk/tmpl/gtktreeview.sgml | 5 -
docs/reference/gtk/tmpl/gtkuimanager.sgml | 32 +-
gdk/gdk.symbols | 1 +
gdk/x11/gdkcursor-x11.c | 7 +-
gdk/x11/gdkdisplay-x11.c | 97 ++-
gdk/x11/gdkx.h | 2 +
gtk/Makefile.am | 2 +-
gtk/gtk.symbols | 12 +-
gtk/gtkapplication.c | 694 ++----------------
gtk/gtkapplication.h | 64 +--
gtk/gtkcomboboxtext.c | 39 +-
gtk/gtknotebook.c | 8 +-
gtk/gtkprinteroptionwidget.c | 15 +-
gtk/gtkselection.c | 2 +-
gtk/gtkwidget.c | 111 ++--
gtk/gtkwidget.h | 2 +
gtk/gtkwindow.c | 94 +++-
gtk/gtkwindow.h | 5 +
gtk/tests/gtk-example-application.c | 100 ++--
modules/other/gail/gailcombobox.c | 6 +-
modules/printbackends/cups/gtkprintbackendcups.c | 9 +-
po-properties/es.po | 779 +++++++++++---------
tests/Makefile.am | 4 +-
tests/testapplication.c | 108 ---
tests/testcombo.c | 64 +-
tests/testgtk.c | 39 +-
tests/testsocket_common.c | 35 +-
52 files changed, 1146 insertions(+), 1685 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]