[gtk+/broadway: 1477/1478] Merge branch 'master' into broadway2
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/broadway: 1477/1478] Merge branch 'master' into broadway2
- Date: Wed, 19 Jan 2011 19:05:35 +0000 (UTC)
commit 920e8b434367f9aa8aab306721cc024e66892e2e
Merge: 190f533 0a5e8ce
Author: Alexander Larsson <alexl redhat com>
Date: Wed Jan 19 19:52:00 2011 +0100
Merge branch 'master' into broadway2
Doesn't build, but fixed up actual conflicts
Conflicts:
configure.ac
gdk/Makefile.am
gtk/Makefile.am
Makefile.am | 62 +-
Makefile.decl | 10 +-
NEWS | 293 +
README.win32 | 2 +-
autogen.sh | 134 +-
build/win32/vs9/gdk-win32.vcproj | 21 +-
build/win32/vs9/gdk.vcprojin | 17 +-
build/win32/vs9/gtk+.vsprops | 35 +-
build/win32/vs9/gtk-demo.vcproj | 16 +-
build/win32/vs9/gtk.vcprojin | 16 +-
configure.ac | 480 +-
demos/Makefile.am | 15 +-
demos/gtk-demo/Makefile.am | 9 +-
demos/gtk-demo/assistant.c | 6 +-
demos/gtk-demo/changedisplay.c | 5 +-
demos/gtk-demo/clipboard.c | 6 +-
demos/gtk-demo/combobox.c | 4 +-
demos/gtk-demo/offscreen_window.c | 1 -
demos/gtk-demo/offscreen_window2.c | 1 -
demos/gtk-demo/stock_browser.c | 6 +-
demos/gtk-demo/toolpalette.c | 2 +-
demos/testpixbuf-scale.c | 4 +-
docs/reference/gdk/Makefile.am | 179 +-
docs/reference/gdk/gdk-docs.sgml | 4 +-
docs/reference/gdk/gdk3-sections.txt | 176 +-
docs/reference/gdk/gdk3.types | 10 +-
docs/reference/gtk/Makefile.am | 21 +-
docs/reference/gtk/building.sgml | 163 +-
docs/reference/gtk/compiling.sgml | 23 +-
docs/reference/gtk/getting_started.xml | 261 +-
docs/reference/gtk/gtk-builder-convert-3.0.xml | 61 -
docs/reference/gtk/gtk-docs.sgml | 7 +-
docs/reference/gtk/gtk-query-immodules-3.0.xml | 2 +-
...con-cache-3.0.xml => gtk-update-icon-cache.xml} | 14 +-
docs/reference/gtk/gtk3-sections.txt | 284 +-
docs/reference/gtk/gtk3.types | 4 +
docs/reference/gtk/images/appchooserbutton.png | Bin 0 -> 5115 bytes
docs/reference/gtk/images/appchooserdialog.png | Bin 0 -> 52118 bytes
docs/reference/gtk/images/drawing.png | Bin 0 -> 3686 bytes
docs/reference/gtk/images/grid-packing.png | Bin 0 -> 4612 bytes
docs/reference/gtk/images/numerableicon.png | Bin 0 -> 2645 bytes
docs/reference/gtk/images/numerableicon2.png | Bin 0 -> 2329 bytes
docs/reference/gtk/migrating-2to3.xml | 106 +-
.../reference/gtk/migrating-ClientSideWindows.sgml | 64 -
docs/reference/gtk/migrating-GtkAboutDialog.sgml | 98 -
docs/reference/gtk/migrating-GtkAction.sgml | 445 -
docs/reference/gtk/migrating-GtkAssistant.sgml | 178 -
docs/reference/gtk/migrating-GtkBuilder.sgml | 102 -
docs/reference/gtk/migrating-GtkColorButton.sgml | 54 -
docs/reference/gtk/migrating-GtkComboBox.sgml | 213 -
docs/reference/gtk/migrating-GtkEntry-icons.sgml | 141 -
docs/reference/gtk/migrating-GtkFileChooser.sgml | 163 -
docs/reference/gtk/migrating-GtkIconView.sgml | 153 -
docs/reference/gtk/migrating-GtkLabel-links.sgml | 24 -
docs/reference/gtk/migrating-GtkLinkButton.sgml | 81 -
docs/reference/gtk/migrating-GtkRecentChooser.sgml | 323 -
docs/reference/gtk/migrating-GtkStyleContext.xml | 101 +-
docs/reference/gtk/migrating-GtkTooltip.sgml | 66 -
docs/reference/gtk/other_software.sgml | 2 +-
docs/reference/gtk/question_index.sgml | 414 +-
docs/reference/gtk/resources.sgml | 2 +-
docs/reference/gtk/running.sgml | 31 +-
docs/reference/gtk/text_widget.sgml | 2 +-
docs/reference/gtk/tmpl/.gitignore | 17 +
docs/reference/gtk/tmpl/gtkcelllayout.sgml | 186 -
docs/reference/gtk/tmpl/gtkdialog.sgml | 406 -
docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 131 -
docs/reference/gtk/tmpl/gtkentrycompletion.sgml | 377 -
docs/reference/gtk/tmpl/gtkenums.sgml | 458 -
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/gtkfilefilter.sgml | 170 -
docs/reference/gtk/tmpl/gtkfixed.sgml | 133 -
docs/reference/gtk/tmpl/gtkmain.sgml | 626 -
docs/reference/gtk/tmpl/gtkmenu.sgml | 494 -
docs/reference/gtk/tmpl/gtkmenubar.sgml | 104 -
docs/reference/gtk/tmpl/gtkmenushell.sgml | 224 -
docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml | 18 +
docs/reference/gtk/tmpl/gtkprintjob.sgml | 186 -
docs/reference/gtk/tmpl/gtkprintoperation.sgml | 9 +-
docs/reference/gtk/tmpl/gtkselection.sgml | 542 -
docs/reference/gtk/tmpl/gtkspinbutton.sgml | 482 -
docs/reference/gtk/tmpl/gtktextbuffer.sgml | 2 +-
docs/reference/gtk/tmpl/gtktexttag.sgml | 498 -
docs/reference/gtk/tmpl/gtktreemodel.sgml | 864 --
docs/reference/gtk/tree_widget.sgml | 2 +-
docs/reference/gtk/visual_index.xml | 6 +
docs/reference/gtk/windows.sgml | 2 +-
docs/reference/gtk/x11.sgml | 40 +-
docs/reference/libgail-util/Makefile.am | 7 +-
.../libgail-util/gail-libgail-util-docs.sgml | 1 +
docs/reference/libgail-util/version.xml.in | 1 +
docs/tools/Makefile.am | 27 +-
docs/tools/shooter.c | 2 +-
docs/tools/widgets.c | 35 +
docs/widget_system.txt | 2 +-
examples/Makefile.am | 13 +-
.../bloatpad.c | 0
examples/drawing.c | 200 +
examples/grid-packing.c | 73 +
examples/gtkdial/dial_test.c | 2 +-
examples/gtkdial/gtkdial.c | 54 +-
examples/hello-world.c | 3 +-
gdk-3.0-uninstalled.pc.in | 8 -
gdk-3.0.pc.in | 8 +-
gdk/Makefile.am | 217 +-
gdk/abicheck.sh | 4 +-
gdk/gdk.c | 247 +-
gdk/gdk.h | 3 +-
gdk/gdk.symbols | 94 +-
gdk/gdkapplaunchcontext.c | 197 +-
gdk/gdkapplaunchcontext.h | 33 +-
gdk/gdkapplaunchcontextprivate.h | 50 +
gdk/gdkcursor.c | 308 +-
gdk/gdkcursor.h | 23 +-
gdk/{gdkinput.h => gdkcursorprivate.h} | 42 +-
gdk/gdkdevice.c | 655 +-
gdk/gdkdevice.h | 61 +-
gdk/gdkdevicemanager.c | 162 +-
gdk/gdkdevicemanager.h | 42 +-
gdk/gdkdevicemanagerprivate.h | 63 +
gdk/gdkdeviceprivate.h | 81 +-
gdk/gdkdisplay.c | 1513 ++-
gdk/gdkdisplay.h | 269 +-
gdk/gdkdisplaymanager.c | 256 +-
gdk/gdkdisplaymanager.h | 32 +-
gdk/gdkdisplaymanagerprivate.h | 71 +
gdk/gdkdisplayprivate.h | 299 +
gdk/gdkdnd.c | 368 +-
gdk/gdkdnd.h | 129 +-
gdk/gdkdndprivate.h | 91 +
gdk/gdkevents.c | 138 +-
gdk/gdkevents.h | 5 +-
gdk/gdkglobals.c | 4 +-
gdk/gdkinternals.h | 244 +-
gdk/gdkkeynames.c | 8 +-
gdk/gdkkeys.c | 465 +-
gdk/gdkkeys.h | 20 -
gdk/gdkkeysprivate.h | 80 +
gdk/gdkmain.h | 44 +-
gdk/gdkoffscreenwindow.c | 90 +-
gdk/gdkpoly-generic.h | 291 -
gdk/gdkproperty.h | 92 +-
gdk/gdkrgba.c | 22 +-
gdk/gdkrgba.h | 2 +-
gdk/gdkscreen.c | 459 +-
gdk/gdkscreen.h | 63 +-
gdk/gdkscreenprivate.h | 104 +
gdk/gdkselection.c | 263 +-
gdk/gdkspawn.h | 62 -
gdk/gdktypes.h | 50 +-
gdk/gdkvisual.c | 271 +-
gdk/gdkvisual.h | 74 +-
gdk/gdkvisualprivate.h | 66 +
gdk/gdkwindow.c | 1809 +++-
gdk/gdkwindow.h | 57 +-
gdk/gdkwindowimpl.h | 148 +-
gdk/{x11/gdkglobals-x11.c => gdkx.h} | 18 +-
gdk/makefile.msc | 78 +-
.../{GdkQuartzWindow.c => GdkQuartzNSWindow.c} | 51 +-
.../{GdkQuartzWindow.h => GdkQuartzNSWindow.h} | 4 +-
gdk/quartz/GdkQuartzView.c | 10 +-
gdk/quartz/Makefile.am | 35 +-
gdk/quartz/gdkapplaunchcontext-quartz.c | 42 -
gdk/quartz/gdkcursor-quartz.c | 211 +-
gdk/quartz/gdkdevice-core-quartz.c | 371 +
gdk/quartz/gdkdevice-core.c | 356 -
...nager-core.c => gdkdevicemanager-core-quartz.c} | 72 +-
.../quartz/gdkdevicemanager-core-quartz.h | 37 +-
gdk/quartz/gdkdevicemanager-core.h | 54 -
gdk/quartz/gdkdisplay-quartz.c | 284 +-
gdk/quartz/gdkdisplaymanager-quartz.c | 177 +
gdk/quartz/gdkdnd-quartz.c | 260 +-
.../gdkglobals-x11.c => quartz/gdkdnd-quartz.h} | 40 +-
gdk/quartz/gdkdrawable-quartz.c | 232 -
gdk/quartz/gdkdrawable-quartz.h | 71 -
gdk/quartz/gdkeventloop-quartz.c | 21 +-
gdk/quartz/gdkevents-quartz.c | 196 +-
gdk/quartz/gdkgeometry-quartz.c | 74 -
gdk/quartz/gdkinput-old.c | 68 -
gdk/quartz/gdkinput.c | 287 -
gdk/quartz/gdkinputprivate.h | 149 -
gdk/quartz/gdkkeys-quartz.c | 154 +-
gdk/quartz/gdkmain-quartz.c | 93 -
gdk/quartz/gdkprivate-quartz.h | 281 +-
gdk/quartz/gdkproperty-quartz.c | 59 +-
gdk/quartz/gdkquartz.h | 24 +-
gdk/quartz/gdkquartzcursor.h | 51 +
gdk/quartz/gdkquartzdevice-core.h | 45 +
gdk/quartz/gdkquartzdevicemanager-core.h | 47 +
gdk/quartz/gdkquartzdisplay.h | 52 +
gdk/quartz/gdkquartzdisplaymanager.h | 48 +
gdk/quartz/gdkquartzdnd.h | 53 +
gdk/quartz/gdkquartzkeys.h | 51 +
gdk/quartz/gdkquartzscreen.h | 51 +
.../gdkglobals-x11.c => quartz/gdkquartzutils.h} | 31 +-
gdk/quartz/gdkquartzvisual.h | 52 +
gdk/quartz/gdkquartzwindow.h | 54 +
gdk/quartz/gdkscreen-quartz.c | 269 +-
gdk/quartz/gdkscreen-quartz.h | 27 +-
gdk/quartz/gdkselection-quartz.c | 111 +-
gdk/quartz/gdkspawn-quartz.c | 106 -
gdk/quartz/gdktestutils-quartz.c | 84 +-
gdk/quartz/gdkutils-quartz.c | 99 +
gdk/quartz/gdkvisual-quartz.c | 131 +-
gdk/quartz/gdkwindow-quartz.c | 1255 ++-
gdk/quartz/gdkwindow-quartz.h | 21 +-
gdk/tests/Makefile.am | 14 +-
gdk/tests/display.c | 74 +
gdk/tests/encoding.c | 46 +
gdk/win32/Makefile.am | 17 +-
gdk/win32/gdkapplaunchcontext-win32.c | 42 -
gdk/win32/gdkcursor-win32.c | 121 +-
gdk/win32/gdkdevice-win32.c | 28 +-
gdk/win32/gdkdevice-wintab.c | 2 +-
gdk/win32/gdkdevicemanager-win32.c | 13 +-
gdk/win32/gdkdevicemanager-win32.h | 2 +-
gdk/win32/gdkdisplay-win32.c | 212 +-
gdk/win32/gdkdisplaymanager-win32.c | 135 +
gdk/win32/gdkdnd-win32.c | 177 +-
gdk/win32/gdkdrawable-win32.c | 222 -
gdk/win32/gdkdrawable-win32.h | 73 -
gdk/win32/gdkevents-win32.c | 195 +-
gdk/win32/gdkgeometry-win32.c | 138 +-
gdk/win32/gdkim-win32.c | 44 -
gdk/win32/gdkinput.c | 11 +-
gdk/win32/gdkkeys-win32.c | 88 +-
gdk/win32/gdkmain-win32.c | 94 +-
gdk/win32/gdkprivate-win32.h | 159 +-
gdk/win32/gdkproperty-win32.c | 28 +-
gdk/win32/gdkscreen-win32.c | 147 +-
gdk/win32/gdkselection-win32.c | 65 +-
gdk/win32/gdkspawn-win32.c | 106 -
gdk/win32/gdktestutils-win32.c | 9 +-
gdk/win32/gdkvisual-win32.c | 79 +-
gdk/win32/gdkwin32.h | 31 +-
gdk/win32/gdkwin32cursor.h | 56 +
gdk/win32/gdkwin32display.h | 56 +
gdk/win32/gdkwin32displaymanager.h | 49 +
gdk/win32/gdkwin32dnd.h | 49 +
gdk/win32/gdkwin32keys.h | 49 +
gdk/win32/gdkwin32screen.h | 56 +
gdk/win32/gdkwin32window.h | 56 +
gdk/win32/gdkwindow-win32.c | 1042 +-
gdk/win32/gdkwindow-win32.h | 40 +-
gdk/win32/makefile.msc | 15 +-
gdk/x11/Makefile.am | 73 +-
gdk/x11/gdkapplaunchcontext-x11.c | 114 +-
gdk/x11/gdkasync.c | 6 +-
gdk/x11/gdkasync.h | 2 +-
gdk/x11/gdkcursor-x11.c | 649 +-
gdk/x11/gdkdevice-core-x11.c | 611 +
gdk/x11/gdkdevice-core.c | 499 -
gdk/x11/gdkdevice-core.h | 52 -
gdk/x11/gdkdevice-xi.c | 409 +-
gdk/x11/gdkdevice-xi.h | 88 -
gdk/x11/gdkdevice-xi2.c | 518 +-
gdk/x11/gdkdevice-xi2.h | 65 -
...emanager-core.c => gdkdevicemanager-core-x11.c} | 590 +-
gdk/x11/gdkdevicemanager-core.h | 54 -
gdk/x11/gdkdevicemanager-x11.c | 23 +-
gdk/x11/gdkdevicemanager-xi.c | 474 +-
gdk/x11/gdkdevicemanager-xi.h | 57 -
gdk/x11/gdkdevicemanager-xi2.c | 516 +-
gdk/x11/gdkdevicemanager-xi2.h | 63 -
...lobals-x11.c => gdkdevicemanagerprivate-core.h} | 33 +-
.../gdkdevice-core.h => x11/gdkdeviceprivate-xi.h} | 47 +-
gdk/x11/gdkdisplay-x11.c | 1070 +-
gdk/x11/gdkdisplay-x11.h | 59 +-
gdk/x11/gdkdisplaymanager-x11.c | 139 +
gdk/x11/gdkdnd-x11.c | 3443 +++---
gdk/x11/gdkeventsource.c | 136 +-
gdk/x11/gdkeventsource.h | 15 +-
gdk/x11/gdkeventtranslator.c | 18 +-
gdk/x11/gdkeventtranslator.h | 25 +-
gdk/x11/gdkgeometry-x11.c | 125 +-
gdk/x11/gdkim-x11.c | 103 -
gdk/x11/gdkinput.c | 227 -
gdk/x11/gdkkeys-x11.c | 1185 +--
gdk/x11/gdkmain-x11.c | 366 +-
gdk/x11/gdkprivate-x11.h | 352 +-
gdk/x11/gdkproperty-x11.c | 232 +-
gdk/x11/gdkscreen-x11.c | 984 +-
gdk/x11/gdkscreen-x11.h | 34 +-
gdk/x11/gdkselection-x11.c | 841 +-
gdk/x11/gdkspawn-x11.c | 214 -
gdk/x11/gdktestutils-x11.c | 109 +-
gdk/x11/gdkvisual-x11.c | 396 +-
gdk/x11/gdkwindow-x11.c | 1778 +--
gdk/x11/gdkwindow-x11.h | 6 +-
gdk/x11/gdkx.h | 241 +-
gdk/x11/gdkx11applaunchcontext.h | 49 +
gdk/x11/gdkx11cursor.h | 82 +
gdk/x11/gdkx11device-core.h | 42 +
gdk/x11/gdkx11device-xi.h | 42 +
gdk/x11/gdkx11device-xi2.h | 41 +
gdk/x11/gdkx11devicemanager-core.h | 43 +
gdk/x11/gdkx11devicemanager-xi.h | 43 +
gdk/x11/gdkx11devicemanager-xi2.h | 43 +
gdk/x11/gdkx11display.h | 94 +
gdk/x11/gdkx11displaymanager.h | 49 +
gdk/x11/gdkx11dnd.h | 49 +
gdk/x11/gdkx11keys.h | 49 +
gdk/x11/gdkx11property.h | 59 +
gdk/x11/gdkx11screen.h | 104 +
gdk/x11/gdkx11selection.h | 64 +
gdk/{quartz/gdkim-quartz.c => x11/gdkx11utils.h} | 47 +-
gdk/x11/gdkx11visual.h | 66 +
gdk/x11/gdkx11window.h | 91 +
gdk/x11/gdkxftdefaults.c | 43 +-
gdk/x11/gdkxid.c | 98 +-
gdk/x11/xsettings-common.h | 32 +-
gtk+-3.0-uninstalled.pc.in | 6 +-
gtk+-3.0.pc.in | 8 +-
gtk+-unix-print-3.0.pc.in | 4 +-
gtk/Makefile.am | 276 +-
gtk/abicheck.sh | 2 +-
gtk/compose-parse.py | 12 +-
gtk/gtk-builder-convert-3.0 | 772 --
gtk/gtk.h | 7 +-
gtk/gtk.symbols | 357 +-
gtk/gtk9slice.c | 34 +-
gtk/gtk9slice.h | 40 +-
gtk/gtkaboutdialog.c | 583 +-
gtk/gtkaccelgroup.c | 30 +-
gtk/gtkaccelgroup.h | 2 +-
gtk/gtkaccellabel.c | 18 +-
gtk/gtkaccelmap.c | 8 +-
gtk/gtkaction.c | 7 +-
gtk/gtkactiongroup.h | 2 +-
gtk/gtkactivatable.c | 1 -
gtk/gtkactivatable.h | 1 -
gtk/gtkadjustment.c | 100 +-
gtk/gtkadjustment.h | 70 +-
gtk/gtkalignment.c | 70 +-
gtk/gtkanimationdescription.c | 26 +-
gtk/gtkanimationdescription.h | 22 +-
gtk/gtkappchooser.c | 11 +
gtk/gtkappchooserbutton.c | 10 +
gtk/gtkappchooserdialog.c | 34 +-
gtk/gtkappchooseronline.c | 32 +-
gtk/gtkappchooseronline.h | 24 +-
gtk/gtkappchooseronlinepk.c | 4 +-
gtk/gtkappchooserwidget.c | 17 +-
gtk/gtkapplication.c | 4 +-
gtk/gtkarrow.c | 51 +-
gtk/gtkassistant.c | 72 +-
gtk/gtkassistant.h | 2 +-
gtk/gtkbbox.c | 2 +-
gtk/gtkbin.c | 5 +
gtk/gtkbindings.c | 1063 +--
gtk/gtkbox.c | 2 +-
gtk/gtkbuildable.c | 1 -
gtk/gtkbuildable.h | 1 -
gtk/gtkbuilder.c | 2 +-
gtk/gtkbuilder.h | 1 -
gtk/gtkbuilderparser.c | 3 +-
gtk/gtkbutton.c | 138 +-
gtk/gtkbutton.h | 5 +-
gtk/gtkcalendar.c | 556 +-
gtk/gtkcellarea.c | 3668 ++++++
gtk/gtkcellarea.h | 488 +
gtk/gtkcellareabox.c | 2276 ++++
gtk/gtkcellareabox.h | 89 +
gtk/gtkcellareaboxcontext.c | 862 ++
gtk/gtkcellareaboxcontextprivate.h | 139 +
gtk/gtkcellareacontext.c | 689 ++
gtk/gtkcellareacontext.h | 137 +
gtk/gtkcelllayout.c | 627 +-
gtk/gtkcelllayout.h | 18 +-
gtk/gtkcellrenderer.c | 140 +-
gtk/gtkcellrenderer.h | 13 +
gtk/gtkcellrendereraccel.c | 227 +-
gtk/gtkcellrendererpixbuf.c | 7 +-
gtk/gtkcellrendererprogress.c | 15 +-
gtk/gtkcellrendererspin.c | 10 +-
gtk/gtkcellrendererspinner.c | 17 +-
gtk/gtkcellrenderertext.c | 93 +-
gtk/gtkcellrenderertoggle.c | 7 +
gtk/gtkcellview.c | 1344 ++--
gtk/gtkcellview.h | 40 +-
gtk/gtkcheckbutton.c | 13 +-
gtk/gtkcheckmenuitem.c | 186 +-
gtk/gtkclipboard-quartz.c | 3 +-
gtk/gtkclipboard.c | 34 +-
gtk/gtkcolorbutton.c | 298 +-
gtk/gtkcolorbutton.h | 17 +-
gtk/gtkcolorsel.c | 59 +-
gtk/gtkcombobox.c | 3199 ++----
gtk/gtkcombobox.h | 20 +-
gtk/gtkcomboboxtext.c | 249 +-
gtk/gtkcontainer.c | 58 +-
gtk/gtkcontainer.h | 9 +-
gtk/gtkcssprovider.c | 349 +-
gtk/gtkdialog.c | 150 +-
gtk/gtkdialog.h | 83 +-
gtk/gtkdnd-quartz.c | 38 +-
gtk/gtkdnd.c | 228 +-
gtk/gtkdrawingarea.c | 121 +-
gtk/gtkdrawingarea.h | 7 +-
gtk/gtkeditable.h | 8 +-
gtk/gtkentry.c | 401 +-
gtk/gtkentrycompletion.c | 804 +-
gtk/gtkentrycompletion.h | 25 +-
gtk/gtkentryprivate.h | 5 +
gtk/gtkenums.h | 312 +-
gtk/gtkeventbox.c | 290 +-
gtk/gtkeventbox.h | 16 +-
gtk/gtkexpander.c | 982 +-
gtk/gtkfilechooser.c | 53 +-
gtk/gtkfilechooserbutton.c | 16 +-
gtk/gtkfilechooserdefault.c | 75 +-
gtk/gtkfilechooserentry.c | 38 +-
gtk/gtkfilefilter.c | 24 +
gtk/gtkfilefilter.h | 35 +
gtk/gtkfixed.c | 78 +-
gtk/gtkfontsel.c | 23 +-
gtk/gtkframe.c | 190 +-
gtk/gtkgrid.c | 5 +-
gtk/gtkhandlebox.c | 155 +-
gtk/gtkhsv.c | 113 +-
gtk/gtkiconfactory.c | 28 +-
gtk/gtkiconfactory.h | 4 +-
gtk/gtkicontheme.c | 47 +-
gtk/gtkiconview.c | 2241 ++---
gtk/gtkiconview.h | 2 +
gtk/gtkimage.c | 165 +-
gtk/gtkimagemenuitem.c | 353 +-
gtk/gtkimcontext.c | 2 +-
gtk/gtkimcontextsimple.c | 82 +-
gtk/gtkimcontextsimpleseqs.h | 8824 +++++++-------
gtk/gtkimmodule.c | 2 +-
gtk/gtkinfobar.c | 148 +-
gtk/gtkinvisible.c | 10 +-
gtk/gtklabel.c | 69 +-
gtk/gtklayout.c | 26 +-
gtk/gtklinkbutton.c | 20 +-
gtk/gtkliststore.c | 29 +-
gtk/gtkliststore.h | 1 -
gtk/gtkmain.c | 1466 ++--
gtk/gtkmain.h | 138 +-
gtk/gtkmainprivate.h | 35 +
gtk/gtkmarshalers.list | 4 +
gtk/gtkmenu.c | 3445 +++---
gtk/gtkmenu.h | 99 +-
gtk/gtkmenubar.c | 91 +-
gtk/gtkmenuitem.c | 1434 ++--
gtk/gtkmenuitem.h | 80 +-
gtk/gtkmenuitemprivate.h | 71 +
gtk/gtkmenuprivate.h | 89 +
gtk/gtkmenushell.c | 1218 ++-
gtk/gtkmenushell.h | 129 +-
gtk/gtkmenushellprivate.h | 82 +
gtk/gtkmenutoolbutton.c | 33 +-
gtk/gtkmessagedialog.c | 19 +-
gtk/gtkmisc.c | 4 -
gtk/gtkmodifierstyle.c | 22 +-
gtk/gtkmodules.c | 2 +-
gtk/gtkmodules.h | 35 +-
gtk/gtknotebook.c | 4812 ++++----
gtk/gtknumerableicon.c | 1048 ++
gtk/gtknumerableicon.h | 89 +
gtk/gtknumerableiconprivate.h | 32 +
gtk/gtkoffscreenwindow.c | 5 +-
gtk/gtkorientable.c | 29 +-
gtk/gtkorientable.h | 3 +
gtk/gtkpagesetup.c | 6 +-
gtk/gtkpaned.c | 62 +-
gtk/gtkpapersize.c | 307 +-
gtk/gtkpathbar.c | 12 +-
gtk/gtkplug-win32.c | 5 +-
gtk/gtkplug-x11.c | 103 +-
gtk/gtkplug.c | 46 +-
gtk/gtkprintbackend.h | 8 +-
gtk/gtkprinter.c | 22 +-
gtk/gtkprinter.h | 2 +-
gtk/gtkprintjob.c | 403 +-
gtk/gtkprintjob.h | 60 +-
gtk/gtkprintoperation-unix.c | 51 +-
gtk/gtkprintoperation-win32.c | 2 +-
gtk/gtkprintoperation.c | 11 +-
gtk/gtkprintoperation.h | 11 +
gtk/gtkprintsettings.c | 12 +-
gtk/gtkprintunixdialog.c | 75 +-
gtk/gtkprivate.h | 22 +-
gtk/gtkprogressbar.c | 236 +-
gtk/gtkquartz.c | 24 +-
gtk/gtkradioaction.c | 7 +-
gtk/gtkradiobutton.c | 4 +-
gtk/gtkrange.c | 752 +-
gtk/gtkrange.h | 11 +-
gtk/gtkrc.c | 3720 +------
gtk/gtkrc.h | 18 -
gtk/gtkrecentaction.c | 14 +-
gtk/gtkrecentchooserdefault.c | 8 +-
gtk/gtkscale.c | 82 +-
gtk/gtkscalebutton.c | 67 +-
gtk/gtkscrollable.c | 2 +-
gtk/gtkscrollbar.c | 12 +-
gtk/gtkscrolledwindow.c | 158 +-
gtk/gtksearchengine.c | 4 +-
gtk/gtksearchenginetracker.c | 571 +-
gtk/gtkselection.c | 140 +-
gtk/gtkselection.h | 216 +-
gtk/gtkselectionprivate.h | 77 +
gtk/gtkseparator.c | 60 +-
gtk/gtkseparatortoolitem.c | 2 -
gtk/gtksettings.c | 1145 +-
gtk/gtksettings.h | 100 +-
gtk/gtksettingsprivate.h | 43 +
gtk/gtkshow.c | 21 +-
gtk/gtksizegroup.c | 7 +-
gtk/gtksizerequest.c | 26 +-
gtk/gtksocket-win32.c | 54 +-
gtk/gtksocket-x11.c | 129 +-
gtk/gtksocket.c | 293 +-
gtk/gtksocket.h | 20 +-
gtk/gtksocketprivate.h | 59 +-
gtk/gtkspinbutton.c | 1517 ++--
gtk/gtkspinbutton.h | 38 +-
gtk/gtkspinner.c | 45 +-
gtk/gtkstatusbar.c | 2 +
gtk/gtkstatusicon.c | 56 +-
gtk/gtkstock.c | 2 +-
gtk/gtkstock.h | 15 +-
gtk/gtkstyle.c | 860 +--
gtk/gtkstyle.h | 14 +-
gtk/gtkstylecontext.c | 458 +-
gtk/gtkstylecontext.h | 165 +-
gtk/gtkstyleproperties.c | 28 +-
gtk/gtkstyleprovider.c | 2 +-
gtk/gtkswitch.c | 165 +-
gtk/gtksymboliccolor.c | 6 +-
gtk/gtktearoffmenuitem.c | 119 +-
gtk/gtktestutils.c | 20 +-
gtk/gtktextattributes.c | 348 +
gtk/gtktextattributes.h | 174 +
gtk/gtktextbtree.c | 47 +-
gtk/gtktextbuffer.c | 36 +-
gtk/gtktextbuffer.h | 16 +-
gtk/gtktextbufferserialize.c | 15 +-
gtk/gtktextchild.h | 13 +-
gtk/gtktextdisplay.c | 207 +-
gtk/gtktextiter.h | 3 +-
gtk/gtktextlayout.c | 10 +-
gtk/gtktextmark.h | 21 +-
gtk/gtktexttag.c | 717 +-
gtk/gtktexttag.h | 172 +-
gtk/gtktexttagprivate.h | 54 +
gtk/gtktexttagtable.c | 82 +-
gtk/gtktextutil.c | 64 +-
gtk/gtktextview.c | 365 +-
gtk/gtkthemes.c | 194 -
gtk/gtkthemes.h | 52 -
gtk/gtkthemingengine.c | 167 +-
gtk/gtkthemingengine.h | 2 +
gtk/gtktimeline.c | 224 +-
gtk/gtktimeline.h | 56 +-
gtk/gtktoggleaction.c | 7 +-
gtk/gtktogglebutton.c | 18 +-
gtk/gtktoolbar.c | 185 +-
gtk/gtktoolbutton.c | 8 +-
gtk/gtktoolitem.c | 4 +-
gtk/gtktoolitemgroup.c | 113 +-
gtk/gtktoolpalette.c | 64 +-
gtk/gtktoolshell.c | 2 +-
gtk/gtktooltip.c | 66 +-
gtk/gtktrayicon-x11.c | 63 +-
gtk/gtktreednd.c | 10 +-
gtk/gtktreemenu.c | 2028 ++++
gtk/gtktreemenu.h | 128 +
gtk/gtktreemodel.c | 1350 ++-
gtk/gtktreemodel.h | 46 +-
gtk/gtktreemodelfilter.c | 38 +
gtk/gtktreemodelfilter.h | 5 +-
gtk/gtktreemodelsort.c | 490 +-
gtk/gtktreemodelsort.h | 30 +-
gtk/gtktreeprivate.h | 456 +-
gtk/gtktreeselection.c | 435 +-
gtk/gtktreeselection.h | 15 +-
gtk/gtktreesortable.h | 1 -
gtk/gtktreestore.c | 435 +-
gtk/gtktreestore.h | 20 +-
gtk/gtktreeview.c | 1984 ++--
gtk/gtktreeview.h | 13 +-
gtk/gtktreeviewcolumn.c | 2729 ++---
gtk/gtktreeviewcolumn.h | 56 +-
gtk/gtktypeutils.c | 47 -
gtk/gtktypeutils.h | 130 -
gtk/gtkuimanager.c | 13 +-
gtk/gtkversion.h.in | 75 +-
gtk/gtkviewport.c | 227 +-
gtk/gtkvolumebutton.c | 115 +-
gtk/gtkwidget.c | 1040 +-
gtk/gtkwidget.h | 28 +-
gtk/gtkwidgetpath.c | 35 +-
gtk/gtkwidgetpath.h | 10 +-
gtk/gtkwidgetprivate.h | 5 +
gtk/gtkwin32embedwidget.c | 14 +-
gtk/gtkwindow-decorate.c | 808 --
gtk/gtkwindow.c | 791 +-
gtk/gtkwindow.h | 95 +-
gtk/gtkwindowprivate.h | 90 +
gtk/makefile.msc.in | 234 +-
gtk/tests/Makefile.am | 29 +-
gtk/tests/builder.c | 4 +
gtk/tests/liststore.c | 83 +
gtk/tests/papersize.c | 128 +
gtk/tests/stylecontext.c | 55 +-
gtk/tests/treestore.c | 83 +
gtk/tests/treeview-scrolling.c | 52 +-
gtk/tests/treeview.c | 80 +
m4macros/gtk-3.0.m4 | 2 +-
makefile.msc | 2 +-
modules/engines/Makefile.am | 4 +
modules/engines/ms-windows/Makefile.am | 4 +-
modules/engines/ms-windows/msw_style.c | 18 +-
modules/engines/pixbuf/Makefile.am | 4 +-
modules/input/Makefile.am | 10 +-
modules/input/gtkimcontextime.c | 4 +
modules/input/gtkimcontextxim.c | 35 +-
modules/other/gail/Makefile.am | 3 +-
modules/other/gail/gail.c | 28 +-
modules/other/gail/gailadjustment.c | 26 +-
modules/other/gail/gailbox.c | 22 -
modules/other/gail/gailmenushell.c | 52 +-
modules/other/gail/gailpaned.c | 24 -
modules/other/gail/gailrange.c | 35 +-
modules/other/gail/gailseparator.c | 22 -
modules/other/gail/gailsubmenuitem.c | 48 +-
modules/other/gail/gailtextview.c | 132 +-
modules/other/gail/gailtoplevel.c | 38 +-
modules/other/gail/gailtreeview.c | 4 +-
modules/other/gail/gailwidget.c | 42 +-
modules/other/gail/libgail-util/Makefile.am | 4 +-
modules/other/gail/libgail-util/gailmisc.c | 465 +-
modules/other/gail/libgail-util/gailmisc.h | 4 -
modules/other/gail/libgail-util/gailutil.def | 1 -
modules/other/gail/tests/Makefile.am | 70 +-
modules/printbackends/cups/Makefile.am | 3 +-
modules/printbackends/cups/gtkprintbackendcups.c | 67 +-
modules/printbackends/cups/gtkprintercups.c | 10 +-
modules/printbackends/file/Makefile.am | 3 +-
modules/printbackends/file/gtkprintbackendfile.c | 104 +-
modules/printbackends/lpr/Makefile.am | 4 +-
modules/printbackends/lpr/gtkprintbackendlpr.c | 40 +-
modules/printbackends/papi/Makefile.am | 4 +-
modules/printbackends/test/Makefile.am | 2 +-
modules/printbackends/test/gtkprintbackendtest.c | 30 +-
perf/Makefile.am | 11 +-
po-properties/POTFILES.in | 19 +-
po-properties/en_GB.po | 4433 ++++----
po-properties/es.po | 3543 ++++---
po-properties/et.po | 2093 +++--
po-properties/eu.po | 5266 ++++-----
po-properties/gl.po | 3715 ++++---
po-properties/he.po | 3460 +++---
po-properties/nb.po | 4065 ++++---
po-properties/pa.po | 3977 ++++---
po-properties/sv.po | 5417 +++++-----
po/POTFILES.in | 23 +-
po/ar.po | 1031 +-
po/en_GB.po | 1030 +-
po/es.po | 994 +-
po/et.po | 143 +-
po/eu.po | 2790 ++---
po/fa.po | 855 +-
po/gl.po | 1038 +-
po/he.po | 1026 +-
po/id.po | 1071 +-
po/kk.po | 834 +-
po/ku.po | 2276 ++--
po/lg.po | 8665 +++++++-------
po/nb.po | 1023 +-
po/pa.po |12317 ++++++++++++--------
po/sv.po | 2599 ++---
po/ug.po | 1327 ++-
po/vi.po | 254 +-
tests/Makefile.am | 49 +-
tests/cellareascaffold.c | 1138 ++
tests/cellareascaffold.h | 79 +
tests/flicker.c | 1 -
tests/gradient1.png | Bin 0 -> 722 bytes
tests/gtkoffscreenbox.c | 1 -
tests/makefile.msc | 16 +-
tests/prop-editor.c | 61 +-
tests/styleexamples.c | 83 +-
tests/testassistant.c | 6 +-
tests/testcairo.c | 5 +-
tests/testcellarea.c | 627 +
tests/testcombo.c | 156 +-
tests/testdnd.c | 27 +-
tests/testgtk.c | 242 +-
tests/testiconview-keynav.c | 36 +-
tests/testimage.c | 2 +-
tests/testinput.c | 17 +-
tests/testnotebookdnd.c | 104 +-
tests/testnumerableicon.c | 198 +
tests/testselection.c | 31 +-
tests/testsocket.c | 15 +-
tests/testtooltips.c | 2 +-
tests/testtoplevelembed.c | 103 +
tests/testtreeedit.c | 212 +-
tests/testtreemenu.c | 556 +
tests/testtreeview.c | 5 +-
tests/testverticalcells.c | 379 +
707 files changed, 112919 insertions(+), 100406 deletions(-)
---
diff --cc configure.ac
index 0f5ae9e,d6bfe47..ad0b8c3
--- a/configure.ac
+++ b/configure.ac
@@@ -242,36 -255,105 +255,119 @@@ AC_ARG_ENABLE(xkb
[enable_xkb="maybe"])
AC_ARG_ENABLE(xinerama,
[AC_HELP_STRING([--enable-xinerama],
- [support xinerama extension if available [default=yes]])],,
- [enable_xinerama="yes"])
- AC_ARG_ENABLE(rebuilds,
- [AC_HELP_STRING([--disable-rebuilds],
- [disable all source autogeneration rules])],,
- [enable_rebuilds=yes])
+ [support Xinerama extension if available [default=maybe]])],,
+ [enable_xinerama="maybe"])
+ AC_ARG_ENABLE(xinput,
+ [AC_HELP_STRING([--enable-xinput],
+ [support XInput extension if available [default=yes]])],,
+ [enable_xinput="maybe"])
+ AC_ARG_ENABLE(xrandr,
+ [AC_HELP_STRING([--enable-xrandr],
+ [support XRandR extension if available [default=maybe]])],,
+ [enable_xrandr="maybe"])
+ AC_ARG_ENABLE(xfixes,
+ [AC_HELP_STRING([--enable-xfixes],
+ [support XFixes extension if available [default=maybe]])],,
+ [enable_xfixes="maybe"])
+ AC_ARG_ENABLE(xcomposite,
+ [AC_HELP_STRING([--enable-xcomposite],
+ [support X Composite extension if available [default=maybe]])],,
+ [enable_xcomposite="maybe"])
+ AC_ARG_ENABLE(xdamage,
+ [AC_HELP_STRING([--enable-xdamage],
+ [support X Damage extension if available [default=maybe]])],,
+ [enable_xdamage="maybe"])
+
+ AC_ARG_ENABLE(x11-backend,
+ [AC_HELP_STRING([--enable-x11-backend],
+ [enable the X11 gdk backend])],
+ [backend_set=yes])
+ AC_ARG_ENABLE(win32-backend,
+ [AC_HELP_STRING([--enable-win32-backend],
+ [enable the Win32 gdk backend])],
+ [backend_set=yes])
+ AC_ARG_ENABLE(quartz-backend,
+ [AC_HELP_STRING([--enable-quartz-backend],
+ [enable the quartz gdk backend])],
+ [backend_set=yes])
++AC_ARG_ENABLE(broadway-backend,
++ [AC_HELP_STRING([--enable-broadway-backend],
++ [enable the broadway (HTML5) gdk backend])],
++ [backend_set=yes])
+
+ if test -z "$backend_set"; then
+ if test "$platform_win32" = yes; then
+ enable_win32_backend=yes
+ else
+ enable_x11_backend=yes
+ fi
+ fi
+
+ cairo_backends=
+ backend_immodules=
+ GDK_BACKENDS=
+ GDK_EXTRA_LIBS=
+ GDK_EXTRA_CFLAGS=
+ GDK_WINDOWING=
+ GIO_PACKAGE=gio-2.0
+ PANGO_PACKAGES="pango pangocairo"
+
+ if test "x$enable_x11_backend" == xyes; then
+ # GDK calls the xlib backend "x11," cairo calls it "xlib." Other
+ # backend names are identical.
+ cairo_backends="$cairo_backends cairo-xlib"
+ GDK_BACKENDS="$GDK_BACKENDS x11"
+ # Pull in gio-unix for GDesktopAppInfo usage, see at least
+ # gdkapplaunchcontext-x11.c
+ GIO_PACKAGE=gio-unix-2.0
+ backend_immodules="$backend_immodules,xim"
+ GDK_WINDOWING="$GDK_WINDOWING
+ #define GDK_WINDOWING_X11"
+ fi
- AC_ARG_WITH(xinput,
- [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])])
+ if test "x$enable_win32_backend" == xyes; then
+ cairo_backends="$cairo_backends cairo-win32"
+ GDK_BACKENDS="$GDK_BACKENDS win32"
+ backend_immodules="$backend_immodules,ime"
+ GDK_WINDOWING="$GDK_WINDOWING
+ #define GDK_NATIVE_WINDOW_POINTER
+ #define GDK_WINDOWING_WIN32"
+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
+ AM_CONDITIONAL(USE_WIN32, true)
+ PANGO_PACKAGES="pangowin32 pangocairo"
+ else
+ AM_CONDITIONAL(USE_WIN32, false)
+ fi
- if test "$platform_win32" = yes; then
- gdktarget=win32
+ if test "x$enable_quartz_backend" == xyes; then
+ cairo_backends="$cairo_backends cairo-quartz"
+ GDK_BACKENDS="$GDK_BACKENDS quartz"
+ GDK_WINDOWING="$GDK_WINDOWING
+ #define GDK_WINDOWING_QUARTZ"
+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
+ AM_CONDITIONAL(USE_QUARTZ, true)
else
- gdktarget=x11
+ AM_CONDITIONAL(USE_QUARTZ, false)
fi
- AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/broadway]] select non-default GDK target],
- gdktarget=$with_gdktarget)
++if test "x$enable_broadway_backend" == xyes; then
++ GDK_BACKENDS="$GDK_BACKENDS broadway"
++ GDK_WINDOWING="$GDK_WINDOWING
++#define GDK_WINDOWING_BROADWAY"
++ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
++ AM_CONDITIONAL(USE_BROADWAY, true)
++else
++ AM_CONDITIONAL(USE_BROADWAY, false)
++fi
+
- AC_SUBST(gdktarget)
- case $gdktarget in
- x11|win32|quartz|broadway) ;;
- *) AC_MSG_ERROR([Invalid target for GDK: use x11, broadway, quartz or win32.]);;
- esac
+ # strip leading space
+ GDK_BACKENDS=${GDK_BACKENDS/# }
- gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
- gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
+ AC_SUBST(GDK_BACKENDS)
- AC_SUBST(gdktargetlib)
- AC_SUBST(gtktargetlib)
+ if test -z "$GDK_BACKENDS"; then
+ AC_MSG_ERROR([No GDK backends selected.])
+ fi
if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
diff --cc gdk/Makefile.am
index eadfc81,b344dfe..90b4520
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@@ -8,8 -9,9 +9,9 @@@ INTROSPECTION_COMPILER_ARGS =
--includedir=$(srcdir) \
--includedir=.
- SUBDIRS = $(gdktarget) . tests
+ SUBDIRS = $(GDK_BACKENDS) . tests
+
-DIST_SUBDIRS = win32 x11 quartz tests
+DIST_SUBDIRS = win32 x11 quartz broadway tests
CLEANFILES =
@@@ -147,23 -157,25 +157,29 @@@ common_sources =
gdkmarshalers.c \
gdkmarshalers.h
- libgdk_broadway_3_0_la_SOURCES = $(common_sources)
- libgdk_broadway_3_0_la_LIBADD = broadway/libgdk-broadway.la $(GDK_DEP_LIBS)
- libgdk_broadway_3_0_la_LDFLAGS = $(LDADD)
+ libgdk_3_0_la_SOURCES = $(common_sources)
+ libgdk_3_0_la_LIBADD = $(GDK_DEP_LIBS)
+ libgdk_3_0_la_LDFLAGS = $(LDADD)
- libgdk_x11_3_0_la_SOURCES = $(common_sources)
- libgdk_x11_3_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS)
- libgdk_x11_3_0_la_LDFLAGS = $(LDADD)
+ if USE_X11
+ libgdk_3_0_la_LIBADD += x11/libgdk-x11.la
+ endif # USE_X11
+
+ if USE_QUARTZ
+ libgdk_3_0_la_LIBADD += quartz/libgdk-quartz.la
+ endif # USE_QUARTZ
- libgdk_quartz_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
- libgdk_quartz_3_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS)
- libgdk_quartz_3_0_la_LDFLAGS = $(LDADD)
+ if USE_WIN32
+ libgdk_3_0_la_SOURCES += gdkkeynames.c
+ libgdk_3_0_la_LIBADD += win32/libgdk-win32.la
+ libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+ libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+ endif # USE_WIN32
- libgdk_win32_3_0_la_SOURCES = $(common_sources) gdkkeynames.c
- libgdk_win32_3_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS)
- libgdk_win32_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
- libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
++if USE_BROADWAY
++libgdk_3_0_la_LIBADD += broadway/libgdk-broadway.la
++endif # USE_BROADWAY
+
if HAVE_INTROSPECTION
introspection_files = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
