[gtk+/native-layout: 136/136] Merge branch 'master' into native-layout
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout: 136/136] Merge branch 'master' into native-layout
- Date: Mon, 16 Aug 2010 16:19:17 +0000 (UTC)
commit 6a5f77a9925c48eaec63d2e94c3263efe142f36d
Merge: 8740bd2 48c34b6
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Mon Aug 16 12:02:02 2010 -0400
Merge branch 'master' into native-layout
build/win32/vs9/gdk-win32.vcproj | 1 -
build/win32/vs9/gtk+.vsprops | 1 -
configure.ac | 14 +-
demos/Makefile.am | 20 -
demos/gtk-demo/appwindow.c | 18 +-
demos/gtk-demo/textview.c | 30 +-
demos/testpixbuf-drawable.c | 115 -
demos/testpixbuf-save.c | 34 +-
demos/testpixbuf.c | 642 ---
docs/reference/gdk/gdk-docs.sgml | 3 -
docs/reference/gdk/gdk3-sections.txt | 212 +-
docs/reference/gdk/gdk3.types | 2 -
docs/reference/gdk/tmpl/colors.sgml | 10 -
docs/reference/gdk/tmpl/drawing.sgml | 290 --
docs/reference/gdk/tmpl/event_structs.sgml | 3 +-
docs/reference/gdk/tmpl/gcs.sgml | 427 --
docs/reference/gdk/tmpl/gdkdisplay.sgml | 9 +
docs/reference/gdk/tmpl/gdkscreen.sgml | 18 -
docs/reference/gdk/tmpl/images.sgml | 228 --
docs/reference/gdk/tmpl/pango_interaction.sgml | 153 +-
docs/reference/gdk/tmpl/pixbufs.sgml | 5 +-
docs/reference/gdk/tmpl/pixmaps.sgml | 74 +-
docs/reference/gdk/tmpl/rgb.sgml | 410 --
docs/reference/gdk/tmpl/visuals.sgml | 10 +-
docs/reference/gdk/tmpl/x_interaction.sgml | 81 -
docs/reference/gtk/building.sgml | 32 -
docs/reference/gtk/gtk-docs.sgml | 2 +-
docs/reference/gtk/gtk3-sections.txt | 18 +-
docs/reference/gtk/migrating-2to3.xml | 388 ++-
docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 13 +-
docs/reference/gtk/tmpl/gtkexpander.sgml | 23 +
docs/reference/gtk/tmpl/gtkgc.sgml | 51 -
docs/reference/gtk/tmpl/gtknotebook.sgml | 18 +
docs/reference/gtk/tmpl/gtktexttag.sgml | 23 -
gdk/Makefile.am | 8 -
gdk/directfb/Makefile.am | 2 -
gdk/directfb/TODO | 1 -
gdk/directfb/gdkcolor-directfb.c | 48 -
gdk/directfb/gdkdisplay-directfb.c | 1 -
gdk/directfb/gdkdrawable-directfb.c | 1007 -----
gdk/directfb/gdkgc-directfb.c | 386 --
gdk/directfb/gdkimage-directfb.c | 405 --
gdk/directfb/gdkpixmap-directfb.c | 105 -
gdk/directfb/gdkprivate-directfb.h | 40 -
gdk/gdk.c | 4 -
gdk/gdk.h | 3 -
gdk/gdk.symbols | 149 +-
gdk/gdkcolor.h | 3 -
gdk/gdkdraw.c | 1437 +-------
gdk/gdkdrawable.h | 264 --
gdk/gdkgc.c | 1465 -------
gdk/gdkgc.h | 288 --
gdk/gdkimage.c | 566 ---
gdk/gdkimage.h | 126 -
gdk/gdkinternals.h | 145 +-
gdk/gdkoffscreenwindow.c | 411 +--
gdk/gdkpango.c | 1219 +------
gdk/gdkpango.h | 104 -
gdk/gdkpixbuf-drawable.c | 1404 +------
gdk/gdkpixbuf-render.c | 30 +-
gdk/gdkpixbuf.h | 18 +-
gdk/gdkpixmap.c | 576 ---
gdk/gdkpixmap.h | 30 -
gdk/gdkrgb.c | 3711 ------------------
gdk/gdkrgb.h | 137 -
gdk/gdkscreen.c | 26 -
gdk/gdkscreen.h | 6 -
gdk/gdktypes.h | 11 -
gdk/gdkwindow.c | 1129 +-----
gdk/gdkwindow.h | 2 -
gdk/gdkwindowimpl.h | 13 +-
gdk/makefile.msc | 4 -
gdk/quartz/Makefile.am | 2 -
gdk/quartz/gdkcolor-quartz.c | 15 -
gdk/quartz/gdkdevice-core.c | 4 +-
gdk/quartz/gdkdrawable-quartz.c | 479 +---
gdk/quartz/gdkevents-quartz.c | 16 +-
gdk/quartz/gdkgc-quartz.c | 686 ----
gdk/quartz/gdkgeometry-quartz.c | 52 +-
gdk/quartz/gdkimage-quartz.c | 301 --
gdk/quartz/gdkpixmap-quartz.c | 53 -
gdk/quartz/gdkprivate-quartz.h | 68 +-
gdk/quartz/gdkwindow-quartz.c | 106 +-
gdk/testgdk.c | 928 -----
gdk/win32/Makefile.am | 2 -
gdk/win32/gdkcolor-win32.c | 38 -
gdk/win32/gdkdisplay-win32.c | 1 -
gdk/win32/gdkdrawable-win32.c | 1128 +------
gdk/win32/gdkgc-win32.c | 1102 ------
gdk/win32/gdkimage-win32.c | 396 --
gdk/win32/gdkpixmap-win32.c | 125 -
gdk/win32/gdkprivate-win32.h | 71 -
gdk/win32/gdkwin32.h | 7 -
gdk/win32/gdkwindow-win32.c | 59 +-
gdk/win32/makefile.msc | 1 -
gdk/x11/Makefile.am | 2 -
gdk/x11/gdkcolor-x11.c | 68 -
gdk/x11/gdkcursor-x11.c | 88 +-
gdk/x11/gdkdisplay-x11.c | 4 -
gdk/x11/gdkdisplay-x11.h | 13 -
gdk/x11/gdkdrawable-x11.c | 953 +-----
gdk/x11/gdkdrawable-x11.h | 2 -
gdk/x11/gdkgc-x11.c | 697 ----
gdk/x11/gdkgeometry-x11.c | 96 +-
gdk/x11/gdkimage-x11.c | 754 ----
gdk/x11/gdkpixmap-x11.c | 98 -
gdk/x11/gdkprivate-x11.h | 53 +-
gdk/x11/gdkscreen-x11.c | 13 +-
gdk/x11/gdkscreen-x11.h | 4 +-
gdk/x11/gdktestutils-x11.c | 9 +-
gdk/x11/gdkwindow-x11.c | 13 +-
gdk/x11/gdkx.h | 11 -
gdk/x11/gdkxftdefaults.c | 37 +-
gtk/Makefile.am | 4 +-
gtk/gtk.h | 1 -
gtk/gtk.symbols | 17 +-
gtk/gtkaboutdialog.c | 159 +-
gtk/gtkaboutdialog.h | 38 +
gtk/gtkaccellabel.c | 6 +-
gtk/gtkaccellabel.h | 4 +-
gtk/gtkbuilder.c | 8 +-
gtk/gtkcalendar.h | 3 -
gtk/gtkcellrendererspin.c | 2 +-
gtk/gtkcellrenderertext.c | 2 +-
gtk/gtkcolorbutton.c | 4 +-
gtk/gtkcolorsel.c | 93 +-
gtk/gtkcombobox.c | 26 +-
gtk/gtkdnd.c | 42 +-
gtk/gtkentry.c | 4 +-
gtk/gtkexpander.c | 102 +-
gtk/gtkexpander.h | 3 +
gtk/gtkfilechooser.c | 2 +-
gtk/gtkfilechooserdefault.c | 41 -
gtk/gtkfilechooserdialog.c | 6 +-
gtk/gtkfilechooserprivate.h | 3 +-
gtk/gtkgc.c | 404 --
gtk/gtkiconview.c | 28 -
gtk/gtkimage.c | 184 +-
gtk/gtkimage.h | 15 -
gtk/gtkimcontext.h | 5 +-
gtk/gtklabel.c | 49 +-
gtk/gtkliststore.c | 4 +-
gtk/gtkmain.c | 23 +-
gtk/gtknotebook.c | 57 +-
gtk/gtknotebook.h | 2 +
gtk/gtkpango.c | 233 ++
gtk/{gtkgc.h => gtkpango.h} | 16 +-
gtk/gtkplug.c | 2 +-
gtk/gtkprintunixdialog.c | 2 +-
gtk/gtkprogressbar.c | 12 +-
gtk/gtkspinbutton.c | 2 +-
gtk/gtkstatusicon.c | 6 +-
gtk/gtkstyle.c | 2489 +++++-------
gtk/gtkstyle.h | 31 -
gtk/gtktextdisplay.c | 364 +-
gtk/gtktextdisplay.h | 2 +-
gtk/gtktextlayout.c | 12 -
gtk/gtktexttag.c | 215 -
gtk/gtktexttag.h | 7 -
gtk/gtktexttagprivate.h | 10 -
gtk/gtktextutil.c | 2 +-
gtk/gtktoggleaction.c | 4 +-
gtk/gtktogglebutton.c | 2 +-
gtk/gtktoggletoolbutton.c | 4 +-
gtk/gtktrayicon-x11.c | 2 -
gtk/gtktreemodel.c | 4 +-
gtk/gtktreeselection.c | 33 +-
gtk/gtktreestore.c | 4 +-
gtk/gtktreeview.c | 7 +
gtk/gtkwidget.c | 15 +-
gtk/gtkwin32embedwidget.c | 37 +-
gtk/tests/defaultvalue.c | 6 -
gtk/tests/filechooser.c | 1 -
modules/engines/ms-windows/msw_style.c | 14 +-
modules/other/gail/gailadjustment.c | 44 +
modules/other/gail/gailimage.c | 8 -
modules/other/gail/gailnotebook.c | 2 +-
modules/other/gail/gailrange.c | 20 +
modules/other/gail/gailspinbutton.c | 20 +
modules/other/gail/gailtreeview.c | 12 +-
modules/other/gail/libgail-util/gailmisc.c | 32 -
po-properties/gl.po | 307 +-
po-properties/he.po | 340 +-
po-properties/pa.po | 3860 +++++++++---------
po-properties/zh_CN.po | 554 ++--
po/LINGUAS | 1 +
po/he.po | 158 +-
po/pa.po | 1745 +++++----
po/ug.po | 5008 ++++++++++++++++++++++++
po/zh_CN.po | 173 +-
tests/Makefile.am | 3 -
tests/testdnd.c | 47 +-
tests/testgtk.c | 517 +---
tests/testrgb.c | 329 --
tests/testwindows.c | 29 +-
195 files changed, 11965 insertions(+), 33340 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
