[gtk+/quartz-integration: 110/551] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 110/551] Merge branch 'master' into quartz-integration
- Date: Wed, 24 Nov 2010 00:28:31 +0000 (UTC)
commit f3bc3cb2bf9cf9a1fb4b990872c3cff4c896a1bb
Merge: d0aa089 df2c5a3
Author: John Ralls <jralls ceridwen us>
Date: Fri Oct 15 13:37:28 2010 -0700
Merge branch 'master' into quartz-integration
configure.ac | 11 +-
demos/gtk-demo/combobox.c | 9 +-
docs/Makefile.am | 2 +-
docs/reference/gdk/gdk-docs.sgml | 16 -
docs/reference/gdk/multihead.sgml | 4 +-
docs/reference/gdk/tmpl/cursors.sgml | 8 +-
docs/reference/gdk/tmpl/general.sgml | 31 +
docs/reference/gdk/tmpl/pango_interaction.sgml | 106 +-
docs/reference/gdk/tmpl/visuals.sgml | 2 +-
docs/reference/gdk/tmpl/x_interaction.sgml | 159 +-
docs/reference/gtk/Makefile.am | 13 +-
docs/reference/gtk/building.sgml | 15 -
docs/reference/gtk/getting_started.xml | 108 +
docs/reference/gtk/gtk-docs.sgml | 106 +-
docs/reference/gtk/gtk3-sections.txt | 97 +-
docs/reference/gtk/gtk3.types | 1 -
docs/reference/gtk/images/hello-world.png | Bin 0 -> 3736 bytes
docs/reference/gtk/images/window-default.png | Bin 0 -> 4845 bytes
docs/reference/gtk/migrating-2to3.xml | 1 +
docs/reference/gtk/migrating-checklist.sgml | 2 +-
docs/reference/gtk/osx.sgml | 2 +-
docs/reference/gtk/overview.xml | 100 +
docs/reference/gtk/tmpl/.gitignore | 2 +
docs/reference/gtk/tmpl/gtkcontainer.sgml | 539 -
docs/reference/gtk/tmpl/gtkdialog.sgml | 43 +-
docs/reference/gtk/tmpl/gtkmain.sgml | 7 +-
docs/reference/gtk/tmpl/gtkprogressbar.sgml | 36 +-
docs/reference/gtk/tmpl/gtkscrolledwindow.sgml | 282 -
docs/reference/gtk/tmpl/gtktable.sgml | 18 +-
docs/tools/widgets.c | 11 +-
docs/tutorial/Makefile.am | 78 -
docs/tutorial/gtk-tut.sgml |16080 -----------------------
docs/tutorial/images/arrow.eps | 1147 --
docs/tutorial/images/arrow.png | Bin 3802 -> 0 bytes
docs/tutorial/images/aspectframe.eps | 5448 --------
docs/tutorial/images/aspectframe.png | Bin 5163 -> 0 bytes
docs/tutorial/images/base.eps | 4287 -------
docs/tutorial/images/base.png | Bin 4462 -> 0 bytes
docs/tutorial/images/buttonbox.eps |16247 ------------------------
docs/tutorial/images/buttonbox.png | Bin 23400 -> 0 bytes
docs/tutorial/images/buttons.eps | 1302 --
docs/tutorial/images/buttons.png | Bin 4063 -> 0 bytes
docs/tutorial/images/calendar.eps |12855 -------------------
docs/tutorial/images/calendar.png | Bin 11252 -> 0 bytes
docs/tutorial/images/colorsel.eps | 6838 ----------
docs/tutorial/images/colorsel.png | Bin 28063 -> 0 bytes
docs/tutorial/images/entry.eps | 2528 ----
docs/tutorial/images/entry.png | Bin 5273 -> 0 bytes
docs/tutorial/images/eventbox.eps | 1077 --
docs/tutorial/images/eventbox.png | Bin 3673 -> 0 bytes
docs/tutorial/images/filesel.eps | 8678 -------------
docs/tutorial/images/filesel.png | Bin 11063 -> 0 bytes
docs/tutorial/images/fixed.eps | 4755 -------
docs/tutorial/images/fixed.png | Bin 5653 -> 0 bytes
docs/tutorial/images/frame.eps | 8778 -------------
docs/tutorial/images/frame.png | Bin 5827 -> 0 bytes
docs/tutorial/images/gtkdial.eps | 2201 ----
docs/tutorial/images/gtkdial.png | Bin 4758 -> 0 bytes
docs/tutorial/images/helloworld.eps | 914 --
docs/tutorial/images/helloworld.png | Bin 3264 -> 0 bytes
docs/tutorial/images/helloworld2.eps | 1136 --
docs/tutorial/images/helloworld2.png | Bin 3911 -> 0 bytes
docs/tutorial/images/label.eps | 8264 ------------
docs/tutorial/images/label.png | Bin 17358 -> 0 bytes
docs/tutorial/images/menu.eps | 2528 ----
docs/tutorial/images/menu.png | Bin 4857 -> 0 bytes
docs/tutorial/images/notebook.eps | 2617 ----
docs/tutorial/images/notebook.png | Bin 8005 -> 0 bytes
docs/tutorial/images/packbox1.eps | 6606 ----------
docs/tutorial/images/packbox1.png | Bin 10366 -> 0 bytes
docs/tutorial/images/packbox2.eps | 4966 --------
docs/tutorial/images/packbox2.png | Bin 9302 -> 0 bytes
docs/tutorial/images/paned.eps | 9533 --------------
docs/tutorial/images/paned.png | Bin 12050 -> 0 bytes
docs/tutorial/images/progressbar.eps | 3581 ------
docs/tutorial/images/progressbar.png | Bin 6135 -> 0 bytes
docs/tutorial/images/radiobuttons.eps | 1695 ---
docs/tutorial/images/radiobuttons.png | Bin 3936 -> 0 bytes
docs/tutorial/images/rangewidgets.eps | 9087 -------------
docs/tutorial/images/rangewidgets.png | Bin 9284 -> 0 bytes
docs/tutorial/images/rulers.eps | 6588 ----------
docs/tutorial/images/rulers.png | Bin 8466 -> 0 bytes
docs/tutorial/images/scribble.eps | 4709 -------
docs/tutorial/images/scribble.png | Bin 5533 -> 0 bytes
docs/tutorial/images/scrolledwin.eps | 8778 -------------
docs/tutorial/images/scrolledwin.png | Bin 7745 -> 0 bytes
docs/tutorial/images/spinbutton.eps | 6635 ----------
docs/tutorial/images/spinbutton.png | Bin 8515 -> 0 bytes
docs/tutorial/images/statusbar.eps | 2528 ----
docs/tutorial/images/statusbar.png | Bin 5155 -> 0 bytes
docs/tutorial/images/table.eps | 1834 ---
docs/tutorial/images/table.png | Bin 4395 -> 0 bytes
docs/tutorial/images/tictactoe.eps | 1097 --
docs/tutorial/images/tictactoe.png | Bin 3100 -> 0 bytes
docs/tutorial/package-db-tutorial.sh | 137 -
examples/{Makefile => Makefile.am} | 28 +-
examples/README.1ST | 41 -
examples/extract.awk | 69 -
examples/extract.sh | 30 -
examples/find-examples.sh | 4 -
examples/hello-world.c | 103 +
examples/window-default.c | 20 +
gdk/Makefile.am | 3 +
gdk/gdk.c | 7 +-
gdk/gdk.h | 135 +-
gdk/gdkapplaunchcontext.c | 1 +
gdk/gdkcairo.c | 20 +-
gdk/gdkcolor.c | 5 +-
gdk/gdkcursor.c | 2 +
gdk/gdkdevice.c | 2 +
gdk/gdkdevicemanager.c | 2 +
gdk/gdkdisplay.c | 8 +-
gdk/gdkdisplaymanager.c | 5 +-
gdk/gdkdnd.c | 8 +-
gdk/gdkdraw.c | 10 +-
gdk/gdkevents.c | 5 +-
gdk/gdkevents.h | 18 +-
gdk/gdkglobals.c | 4 +-
gdk/gdkinternals.h | 3 +
gdk/gdkkeynames.c | 7 +-
gdk/gdkkeys.c | 3 +-
gdk/gdkkeyuni.c | 3 +-
gdk/gdkmain.h | 109 +
gdk/gdkmarshalers.list | 1 +
gdk/gdkmedialib.c | 4 +-
gdk/gdkoffscreenwindow.c | 118 +-
gdk/gdkpango.c | 7 +-
gdk/gdkpixbuf-drawable.c | 5 +-
gdk/gdkrectangle.c | 3 +-
gdk/gdkrectangle.h | 53 +
gdk/gdkscreen.c | 6 +-
gdk/gdkscreen.h | 4 +-
gdk/gdkselection.c | 4 +-
gdk/gdkthreads.h | 72 +
gdk/gdkvisual.c | 2 +
gdk/gdkvisual.h | 30 +-
gdk/gdkwindow.c | 70 +-
gdk/gdkwindow.h | 29 +
gdk/gdkwindowimpl.c | 2 +
gdk/x11/checksettings.c | 7 +-
gdk/x11/gdkapplaunchcontext-x11.c | 12 +-
gdk/x11/gdkasync.c | 7 +-
gdk/x11/gdkasync.h | 2 +-
gdk/x11/gdkcursor-x11.c | 43 +-
gdk/x11/gdkdevice-core.c | 3 +-
gdk/x11/gdkdevice-xi.c | 5 +-
gdk/x11/gdkdevice-xi2.c | 3 +-
gdk/x11/gdkdevice-xi2.h | 1 +
gdk/x11/gdkdevicemanager-core.c | 5 +-
gdk/x11/gdkdevicemanager-x11.c | 4 +-
gdk/x11/gdkdevicemanager-xi.c | 1 +
gdk/x11/gdkdevicemanager-xi2.c | 7 +-
gdk/x11/gdkdisplay-x11.c | 15 +-
gdk/x11/gdkdisplay-x11.h | 7 +-
gdk/x11/gdkdnd-x11.c | 19 +-
gdk/x11/gdkdrawable-x11.c | 12 +-
gdk/x11/gdkdrawable-x11.h | 1 -
gdk/x11/gdkeventsource.c | 1 +
gdk/x11/gdkgeometry-x11.c | 3 +-
gdk/x11/gdkglobals-x11.c | 3 +-
gdk/x11/gdkim-x11.c | 10 +-
gdk/x11/gdkinput.c | 4 +-
gdk/x11/gdkkeys-x11.c | 14 +-
gdk/x11/gdkmain-x11.c | 18 +-
gdk/x11/gdkprivate-x11.h | 10 +-
gdk/x11/gdkproperty-x11.c | 14 +-
gdk/x11/gdkscreen-x11.c | 10 +-
gdk/x11/gdkscreen-x11.h | 4 +-
gdk/x11/gdkselection-x11.c | 10 +-
gdk/x11/gdkspawn-x11.c | 5 +-
gdk/x11/gdktestutils-x11.c | 10 +-
gdk/x11/gdkvisual-x11.c | 8 +-
gdk/x11/gdkwindow-x11.c | 31 +-
gdk/x11/gdkx.h | 1 -
gdk/x11/gdkxftdefaults.c | 3 +
gdk/x11/gdkxid.c | 2 +
gdk/x11/gxid_proto.h | 39 -
gdk/x11/xsettings-client.c | 6 +-
gdk/x11/xsettings-common.c | 6 +-
gdk/x11/xsettings-common.h | 2 +
gtk/Makefile.am | 11 +-
gtk/gtk.h | 1 -
gtk/gtk.symbols | 48 +-
gtk/gtkaccelgroup.c | 2 +-
gtk/gtkaccelgroup.h | 3 +-
gtk/gtkbox.c | 103 +-
gtk/gtkcellrenderercombo.c | 7 +-
gtk/gtkcombobox.c | 359 +-
gtk/gtkcombobox.h | 6 +
gtk/gtkcomboboxentry.c | 11 +
gtk/gtkcomboboxentry.h | 3 +
gtk/gtkcontainer.c | 298 +-
gtk/gtkcontainer.h | 11 +
gtk/gtkenums.h | 54 -
gtk/gtkeventbox.c | 86 +-
gtk/gtkfilechooserdefault.c | 85 +-
gtk/gtkfilechooserdialog.c | 1 -
gtk/gtkfilechooserprivate.h | 2 +
gtk/gtkfilechoosersettings.c | 504 -
gtk/gtkfilechoosersettings.h | 118 -
gtk/gtklinkbutton.c | 60 +-
gtk/gtklinkbutton.h | 19 +
gtk/gtkmain.c | 3 +-
gtk/gtkmain.h | 2 +
gtk/gtkmenuitem.c | 7 +-
gtk/gtknotebook.c | 50 +-
gtk/gtkprinteroptionwidget.c | 7 +-
gtk/gtkprivate.h | 9 +
gtk/gtkrange.c | 60 +-
gtk/gtkrecentmanager.c | 4 +-
gtk/gtkscrolledwindow.c | 334 +-
gtk/gtkselection.c | 68 +-
gtk/gtkselection.h | 6 +
gtk/gtksizegroup-private.h | 49 +
gtk/gtksizegroup.c | 50 +-
gtk/gtksizegroup.h | 9 -
gtk/gtksizerequest.c | 2 +-
gtk/gtktable.c | 87 +-
gtk/gtktreeview.c | 86 +-
gtk/gtkwidget.c | 702 +-
gtk/gtkwidget.h | 31 +-
gtk/gtkwindow.c | 445 +-
gtk/gtkwindow.h | 8 +
gtk/gtkwrapbox.c | 2636 ----
gtk/gtkwrapbox.h | 102 -
gtk/org.gtk.Settings.FileChooser.gschema.xml | 64 +
gtk/tests/builder.c | 3 +-
gtk/tests/defaultvalue.c | 5 +
gtk/tests/object.c | 10 +-
gtk/tests/testing.c | 2 +
gtk/tests/treeview-scrolling.c | 344 +-
modules/engines/Makefile.am | 2 +-
modules/engines/ms-windows/msw_style.c | 528 +-
modules/engines/ms-windows/xp_theme.c | 124 +-
modules/engines/ms-windows/xp_theme.h | 16 +-
modules/input/Makefile.am | 2 +
modules/other/gail/gailtreeview.c | 46 +-
po-properties/ca.po | 3962 +++---
po-properties/el.po | 3955 +++---
po-properties/es.po | 3580 +++---
po-properties/gl.po | 3532 +++---
po-properties/pa.po | 3788 +++---
po/es.po | 1737 ++--
po/et.po | 879 +--
po/gl.po | 1717 ++--
po/pa.po | 1776 ++--
po/sl.po | 2092 ++--
tests/Makefile.am | 19 +-
tests/gtkoffscreenbox.c | 12 +
tests/testcombo.c | 14 +-
tests/testexpand.c | 219 +
tests/testgeometry.c | 232 +
tests/testgtk.c | 178 +-
tests/testsocket_common.c | 10 +-
tests/testwrapbox.c | 496 -
255 files changed, 18205 insertions(+), 196384 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
