[gtk+/client-side-decorations: 1145/1146] Merge master into client-side-decorations
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/client-side-decorations: 1145/1146] Merge master into client-side-decorations
- Date: Wed, 9 Jun 2010 21:38:22 +0000 (UTC)
commit 6da936a45219849e583a51a19d05f14d2c8ebbd4
Merge: 213ff8f 9959986
Author: Federico Mena Quintero <federico novell com>
Date: Tue Jun 8 15:30:19 2010 -0500
Merge master into client-side-decorations
Makefile.am | 81 +-
NEWS | 171 +
README.in | 14 +-
autogen.sh | 10 +-
build/win32/vs9/Makefile.am | 2 +-
build/win32/vs9/gtk+.vsprops | 2 +-
configure.in => configure.ac | 279 +-
contrib/gdk-pixbuf-xlib/Makefile.am | 14 +-
...uf-xlib-2.0.pc.in => gdk-pixbuf-xlib-3.0.pc.in} | 2 +-
demos/Makefile.am | 4 +-
demos/gtk-demo/Makefile.am | 14 +-
demos/gtk-demo/appwindow.c | 16 +
demos/gtk-demo/assistant.c | 55 +-
demos/gtk-demo/images.c | 21 +
demos/gtk-demo/list_store.c | 30 +
demos/gtk-demo/main.c | 4 +-
demos/pixbuf-init.c | 2 +-
docs/RELEASE-HOWTO | 6 +-
docs/faq/gtk-faq.sgml | 58 +-
docs/gtk-config.txt | 4 +-
docs/refcounting.txt | 2 +-
docs/reference/gdk-pixbuf/Makefile.am | 41 +-
...xbuf-csource.xml => gdk-pixbuf-csource-3.0.xml} | 26 +-
.../gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml | 74 +
.../gdk-pixbuf/gdk-pixbuf-query-loaders.xml | 55 -
docs/reference/gdk-pixbuf/gdk-pixbuf.sgml | 6 +-
...ixbuf-sections.txt => gdk-pixbuf3-sections.txt} | 4 -
.../{gdk-pixbuf.types => gdk-pixbuf3.types} | 0
docs/reference/gdk-pixbuf/tmpl/animation.sgml | 20 +-
docs/reference/gdk-pixbuf/tmpl/creating.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/file-loading.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/file-saving.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml | 4 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 44 +-
.../tmpl/gdk-pixbuf-xlib-from-drawables.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml | 3 +
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml | 10 +
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 7 +-
.../gdk-pixbuf/tmpl/initialization_versions.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/inline.sgml | 3 +
.../gdk-pixbuf/tmpl/module_interface.sgml | 94 +-
docs/reference/gdk-pixbuf/tmpl/refcounting.sgml | 16 +-
docs/reference/gdk-pixbuf/tmpl/scaling.sgml | 3 +
docs/reference/gdk-pixbuf/tmpl/util.sgml | 3 +
docs/reference/gdk/Makefile.am | 2 +-
docs/reference/gdk/gdk-docs.sgml | 44 +-
.../gdk/{gdk-overrides.txt => gdk3-overrides.txt} | 0
.../gdk/{gdk-sections.txt => gdk3-sections.txt} | 177 +-
docs/reference/gdk/{gdk.types => gdk3.types} | 2 +
docs/reference/gdk/tmpl/.gitignore | 1 +
docs/reference/gdk/tmpl/cairo_interaction.sgml | 3 +
docs/reference/gdk/tmpl/colors.sgml | 119 +-
docs/reference/gdk/tmpl/cursors.sgml | 11 +-
docs/reference/gdk/tmpl/dnd.sgml | 82 +-
docs/reference/gdk/tmpl/drawing.sgml | 3 +
docs/reference/gdk/tmpl/event_structs.sgml | 5 +-
docs/reference/gdk/tmpl/events.sgml | 67 +-
docs/reference/gdk/tmpl/fonts.sgml | 3 +
docs/reference/gdk/tmpl/gcs.sgml | 39 +-
docs/reference/gdk/tmpl/gdk-unused.sgml | 8 +
docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml | 4 +
docs/reference/gdk/tmpl/gdkdisplay.sgml | 86 +
docs/reference/gdk/tmpl/gdkdisplaymanager.sgml | 4 +
docs/reference/gdk/tmpl/gdkscreen.sgml | 4 +
docs/reference/gdk/tmpl/gdktesting.sgml | 3 +
docs/reference/gdk/tmpl/general.sgml | 61 +-
docs/reference/gdk/tmpl/images.sgml | 89 +-
docs/reference/gdk/tmpl/input.sgml | 13 +-
docs/reference/gdk/tmpl/input_devices.sgml | 304 -
docs/reference/gdk/tmpl/keys.sgml | 13 +
docs/reference/gdk/tmpl/pango_interaction.sgml | 13 +-
docs/reference/gdk/tmpl/pixbufs.sgml | 37 +-
docs/reference/gdk/tmpl/pixmaps.sgml | 33 +-
docs/reference/gdk/tmpl/properties.sgml | 3 +
docs/reference/gdk/tmpl/regions.sgml | 4 +
docs/reference/gdk/tmpl/rgb.sgml | 50 +-
docs/reference/gdk/tmpl/selections.sgml | 29 +-
docs/reference/gdk/tmpl/threads.sgml | 6 +
docs/reference/gdk/tmpl/visuals.sgml | 139 +-
docs/reference/gdk/tmpl/windows.sgml | 1853 -----
docs/reference/gdk/tmpl/x_interaction.sgml | 23 +-
docs/reference/gtk/Makefile.am | 66 +-
docs/reference/gtk/building.sgml | 510 +-
docs/reference/gtk/changes-1.2.sgml | 464 --
docs/reference/gtk/changes-2.0.sgml | 1180 ---
docs/reference/gtk/compiling.sgml | 35 +-
docs/reference/gtk/glossary.xml | 2 +-
...der-convert.xml => gtk-builder-convert-3.0.xml} | 8 +-
docs/reference/gtk/gtk-docs.sgml | 136 +-
docs/reference/gtk/gtk-overrides.txt | 15 -
docs/reference/gtk/gtk-query-immodules-2.0.xml | 54 -
docs/reference/gtk/gtk-query-immodules-3.0.xml | 72 +
...con-cache.xml => gtk-update-icon-cache-3.0.xml} | 44 +-
.../gtk/{gtk-sections.txt => gtk3-sections.txt} | 1159 +---
docs/reference/gtk/{gtk.types => gtk3.types} | 21 +-
docs/reference/gtk/migrating-2to3.xml | 80 +
docs/reference/gtk/migrating-checklist.sgml | 137 +-
docs/reference/gtk/objects_grouped.sgml | 2 -
docs/reference/gtk/question_index.sgml | 13 +-
docs/reference/gtk/running.sgml | 97 +-
docs/reference/gtk/tmpl/.gitignore | 27 +
docs/reference/gtk/tmpl/gtk-unused.sgml | 4007 ----------
docs/reference/gtk/tmpl/gtkaccelmap.sgml | 4 +
docs/reference/gtk/tmpl/gtkaction.sgml | 560 --
docs/reference/gtk/tmpl/gtkactiongroup.sgml | 16 +
docs/reference/gtk/tmpl/gtkadjustment.sgml | 3 +
docs/reference/gtk/tmpl/gtkalignment.sgml | 141 -
docs/reference/gtk/tmpl/gtkarrow.sgml | 82 -
docs/reference/gtk/tmpl/gtkaspectframe.sgml | 88 -
docs/reference/gtk/tmpl/gtkassistant.sgml | 344 -
docs/reference/gtk/tmpl/gtkbbox.sgml | 210 -
docs/reference/gtk/tmpl/gtkbin.sgml | 54 -
docs/reference/gtk/tmpl/gtkbindings.sgml | 29 +-
docs/reference/gtk/tmpl/gtkbox.sgml | 291 -
docs/reference/gtk/tmpl/gtkbuildable.sgml | 193 -
docs/reference/gtk/tmpl/gtkbuilder.sgml | 462 --
docs/reference/gtk/tmpl/gtkbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkcalendar.sgml | 26 +-
docs/reference/gtk/tmpl/gtkcelleditable.sgml | 3 +
docs/reference/gtk/tmpl/gtkcelllayout.sgml | 3 +
docs/reference/gtk/tmpl/gtkcellrenderer.sgml | 11 +-
docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml | 4 +
.../gtk/tmpl/gtkcellrendererprogress.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrendererspin.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrenderertext.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml | 4 +
docs/reference/gtk/tmpl/gtkcellview.sgml | 13 +-
docs/reference/gtk/tmpl/gtkcheckbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 23 +-
docs/reference/gtk/tmpl/gtkclipboard.sgml | 3 +
docs/reference/gtk/tmpl/gtkcolorbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkcolorsel.sgml | 62 +-
docs/reference/gtk/tmpl/gtkcolorseldlg.sgml | 3 +
docs/reference/gtk/tmpl/gtkcombobox.sgml | 14 +
docs/reference/gtk/tmpl/gtkcomboboxentry.sgml | 5 +
docs/reference/gtk/tmpl/gtkcontainer.sgml | 141 +-
docs/reference/gtk/tmpl/gtkctree.sgml | 1260 ---
docs/reference/gtk/tmpl/gtkcurve.sgml | 163 -
docs/reference/gtk/tmpl/gtkdialog.sgml | 4 +
docs/reference/gtk/tmpl/gtkdnd.sgml | 25 +-
docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 19 +-
docs/reference/gtk/tmpl/gtkeditable.sgml | 3 +
docs/reference/gtk/tmpl/gtkentry.sgml | 76 +-
docs/reference/gtk/tmpl/gtkentrybuffer.sgml | 3 +
docs/reference/gtk/tmpl/gtkentrycompletion.sgml | 4 +
docs/reference/gtk/tmpl/gtkenums.sgml | 43 +-
docs/reference/gtk/tmpl/gtkeventbox.sgml | 4 +
docs/reference/gtk/tmpl/gtkexpander.sgml | 3 +
docs/reference/gtk/tmpl/gtkfeatures.sgml | 3 +
docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml | 14 +-
docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml | 25 +-
docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml | 13 +-
docs/reference/gtk/tmpl/gtkfilefilter.sgml | 4 +
docs/reference/gtk/tmpl/gtkfixed.sgml | 22 +-
docs/reference/gtk/tmpl/gtkfontbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtkfontsel.sgml | 13 +-
docs/reference/gtk/tmpl/gtkfontseldlg.sgml | 21 +-
docs/reference/gtk/tmpl/gtkframe.sgml | 3 +
docs/reference/gtk/tmpl/gtkgamma.sgml | 47 -
docs/reference/gtk/tmpl/gtkgc.sgml | 3 +
docs/reference/gtk/tmpl/gtkhandlebox.sgml | 4 +
docs/reference/gtk/tmpl/gtkhbbox.sgml | 38 +-
docs/reference/gtk/tmpl/gtkhbox.sgml | 49 -
docs/reference/gtk/tmpl/gtkhpaned.sgml | 4 +
docs/reference/gtk/tmpl/gtkhruler.sgml | 4 +
docs/reference/gtk/tmpl/gtkhscale.sgml | 3 +
docs/reference/gtk/tmpl/gtkhscrollbar.sgml | 3 +
docs/reference/gtk/tmpl/gtkhseparator.sgml | 4 +
docs/reference/gtk/tmpl/gtkhsv.sgml | 4 +
docs/reference/gtk/tmpl/gtkiconfactory.sgml | 6 +
docs/reference/gtk/tmpl/gtkicontheme.sgml | 20 +
docs/reference/gtk/tmpl/gtkiconview.sgml | 4 +
docs/reference/gtk/tmpl/gtkimagemenuitem.sgml | 4 +
docs/reference/gtk/tmpl/gtkimcontext.sgml | 3 +
docs/reference/gtk/tmpl/gtkimcontextsimple.sgml | 4 +
docs/reference/gtk/tmpl/gtkimmulticontext.sgml | 4 +
docs/reference/gtk/tmpl/gtkinputdialog.sgml | 75 -
docs/reference/gtk/tmpl/gtkinvisible.sgml | 4 +
docs/reference/gtk/tmpl/gtkitem.sgml | 3 +
docs/reference/gtk/tmpl/gtklabel.sgml | 58 +-
docs/reference/gtk/tmpl/gtklayout.sgml | 19 +-
docs/reference/gtk/tmpl/gtklinkbutton.sgml | 3 +
docs/reference/gtk/tmpl/gtkliststore.sgml | 3 +
docs/reference/gtk/tmpl/gtkmain.sgml | 234 +-
docs/reference/gtk/tmpl/gtkmenu.sgml | 52 +-
docs/reference/gtk/tmpl/gtkmenubar.sgml | 35 +-
docs/reference/gtk/tmpl/gtkmenuitem.sgml | 20 +-
docs/reference/gtk/tmpl/gtkmenushell.sgml | 3 +
docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml | 14 +-
docs/reference/gtk/tmpl/gtkmessagedialog.sgml | 213 -
docs/reference/gtk/tmpl/gtkmisc.sgml | 3 +
docs/reference/gtk/tmpl/gtknotebook.sgml | 95 +-
docs/reference/gtk/tmpl/gtkobject.sgml | 504 --
docs/reference/gtk/tmpl/gtkoldeditable.sgml | 169 -
docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 124 -
docs/reference/gtk/tmpl/gtkorientable.sgml | 56 -
docs/reference/gtk/tmpl/gtkpagesetup.sgml | 4 +
.../reference/gtk/tmpl/gtkpagesetupunixdialog.sgml | 79 -
docs/reference/gtk/tmpl/gtkpaned.sgml | 36 +-
docs/reference/gtk/tmpl/gtkpapersize.sgml | 4 +
docs/reference/gtk/tmpl/gtkpixmap.sgml | 83 -
docs/reference/gtk/tmpl/gtkprintcontext.sgml | 3 +
docs/reference/gtk/tmpl/gtkprinter.sgml | 333 -
docs/reference/gtk/tmpl/gtkprintjob.sgml | 3 +
docs/reference/gtk/tmpl/gtkprintoperation.sgml | 4 +
docs/reference/gtk/tmpl/gtkprintsettings.sgml | 4 +
docs/reference/gtk/tmpl/gtkprintunixdialog.sgml | 3 +
docs/reference/gtk/tmpl/gtkprogress.sgml | 3 +
docs/reference/gtk/tmpl/gtkprogressbar.sgml | 88 +-
docs/reference/gtk/tmpl/gtkradioaction.sgml | 100 -
docs/reference/gtk/tmpl/gtkradiobutton.sgml | 205 -
docs/reference/gtk/tmpl/gtkradiomenuitem.sgml | 10 +-
docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml | 3 +
docs/reference/gtk/tmpl/gtkrange.sgml | 421 -
docs/reference/gtk/tmpl/gtkrc.sgml | 137 +-
docs/reference/gtk/tmpl/gtkrecentaction.sgml | 81 -
docs/reference/gtk/tmpl/gtkrecentchooser.sgml | 457 --
.../reference/gtk/tmpl/gtkrecentchooserdialog.sgml | 93 -
docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml | 88 -
.../reference/gtk/tmpl/gtkrecentchooserwidget.sgml | 54 -
docs/reference/gtk/tmpl/gtkrecentfilter.sgml | 4 +
docs/reference/gtk/tmpl/gtkrecentmanager.sgml | 23 +-
docs/reference/gtk/tmpl/gtkruler.sgml | 12 +
docs/reference/gtk/tmpl/gtkscale.sgml | 30 +-
docs/reference/gtk/tmpl/gtkscalebutton.sgml | 173 -
docs/reference/gtk/tmpl/gtkscrollbar.sgml | 18 +-
docs/reference/gtk/tmpl/gtkscrolledwindow.sgml | 3 +
docs/reference/gtk/tmpl/gtkselection.sgml | 12 +-
docs/reference/gtk/tmpl/gtkseparator.sgml | 26 -
docs/reference/gtk/tmpl/gtkseparatormenuitem.sgml | 36 -
docs/reference/gtk/tmpl/gtkseparatortoolitem.sgml | 77 -
docs/reference/gtk/tmpl/gtksettings.sgml | 9 +
docs/reference/gtk/tmpl/gtksignal.sgml | 759 --
docs/reference/gtk/tmpl/gtksizegroup.sgml | 3 +
docs/reference/gtk/tmpl/gtksocket.sgml | 170 -
docs/reference/gtk/tmpl/gtkspinbutton.sgml | 14 +-
docs/reference/gtk/tmpl/gtkstatusbar.sgml | 4 +
docs/reference/gtk/tmpl/gtkstatusicon.sgml | 13 +-
docs/reference/gtk/tmpl/gtkstyle.sgml | 1033 ---
docs/reference/gtk/tmpl/gtktable.sgml | 3 +
docs/reference/gtk/tmpl/gtktearoffmenuitem.sgml | 4 +
docs/reference/gtk/tmpl/gtktesting.sgml | 177 -
docs/reference/gtk/tmpl/gtktext.sgml | 238 -
docs/reference/gtk/tmpl/gtktextbuffer.sgml | 3 +
docs/reference/gtk/tmpl/gtktextiter.sgml | 907 ---
docs/reference/gtk/tmpl/gtktextmark.sgml | 3 +
docs/reference/gtk/tmpl/gtktexttag.sgml | 4 +
docs/reference/gtk/tmpl/gtktexttagtable.sgml | 4 +
docs/reference/gtk/tmpl/gtktextview.sgml | 41 +
docs/reference/gtk/tmpl/gtktoggleaction.sgml | 100 -
docs/reference/gtk/tmpl/gtktogglebutton.sgml | 12 +-
docs/reference/gtk/tmpl/gtktoggletoolbutton.sgml | 4 +
docs/reference/gtk/tmpl/gtktoolbar.sgml | 251 +-
docs/reference/gtk/tmpl/gtktoolbutton.sgml | 3 +
docs/reference/gtk/tmpl/gtktoolitem.sgml | 328 -
docs/reference/gtk/tmpl/gtktooltip.sgml | 3 +
docs/reference/gtk/tmpl/gtktooltips.sgml | 191 -
docs/reference/gtk/tmpl/gtktree.sgml | 306 -
docs/reference/gtk/tmpl/gtktreednd.sgml | 141 -
docs/reference/gtk/tmpl/gtktreeitem.sgml | 119 -
docs/reference/gtk/tmpl/gtktreemodel.sgml | 37 +-
docs/reference/gtk/tmpl/gtktreemodelfilter.sgml | 3 +
docs/reference/gtk/tmpl/gtktreemodelsort.sgml | 3 +
docs/reference/gtk/tmpl/gtktreeselection.sgml | 3 +
docs/reference/gtk/tmpl/gtktreesortable.sgml | 3 +
docs/reference/gtk/tmpl/gtktreestore.sgml | 3 +
docs/reference/gtk/tmpl/gtktreeview.sgml | 28 +-
docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml | 13 +-
docs/reference/gtk/tmpl/gtktypeutils.sgml | 576 +--
docs/reference/gtk/tmpl/gtkuimanager.sgml | 4 +
docs/reference/gtk/tmpl/gtkvbbox.sgml | 98 -
docs/reference/gtk/tmpl/gtkviewport.sgml | 134 -
docs/reference/gtk/tmpl/gtkvolumebutton.sgml | 35 -
docs/reference/gtk/tmpl/gtkvpaned.sgml | 35 -
docs/reference/gtk/tmpl/gtkvruler.sgml | 50 -
docs/reference/gtk/tmpl/gtkwindow.sgml | 94 +-
docs/reference/gtk/tmpl/gtkwindowgroup.sgml | 14 +
docs/reference/gtk/x11.sgml | 54 -
docs/reference/libgail-util/Makefile.am | 2 +-
...ections.txt => gail-libgail-util3-sections.txt} | 0
.../gail-libgail-util3.types} | 0
docs/reference/libgail-util/tmpl/gailmisc.sgml | 125 -
docs/reference/libgail-util/tmpl/gailtextutil.sgml | 95 -
docs/styles.txt | 11 -
docs/tools/shooter.c | 5 +-
docs/tutorial/gtk-tut.sgml | 39 +-
examples/Makefile | 5 -
examples/buttonbox/buttonbox.c | 1 -
examples/calendar/calendar.c | 2 +-
examples/clist/Makefile | 14 -
examples/clist/clist.c | 173 -
examples/colorsel/colorsel.c | 2 +-
examples/filesel/Makefile | 14 -
examples/filesel/filesel.c | 40 -
examples/gdk/composited-window-example.c | 136 +
examples/list/Makefile | 16 -
examples/list/list.c | 266 -
examples/scribble-xinput/Makefile | 5 +-
examples/text/Makefile | 16 -
examples/text/text.c | 182 -
examples/tree/Makefile | 16 -
examples/tree/tree.c | 184 -
examples/wheelbarrow/wheelbarrow.c | 1 -
...uninstalled.pc.in => gail-3.0-uninstalled.pc.in | 2 +-
gail.pc.in => gail-3.0.pc.in | 6 +-
...-uninstalled.pc.in => gdk-3.0-uninstalled.pc.in | 2 +-
gdk-2.0.pc.in => gdk-3.0.pc.in | 4 +-
...alled.pc.in => gdk-pixbuf-3.0-uninstalled.pc.in | 0
gdk-pixbuf-2.0.pc.in => gdk-pixbuf-3.0.pc.in | 2 +-
gdk-pixbuf/Makefile.am | 84 +-
gdk-pixbuf/abicheck.sh | 2 +-
gdk-pixbuf/gdk-pixbuf-animation.c | 30 -
gdk-pixbuf/gdk-pixbuf-animation.h | 7 +-
gdk-pixbuf/gdk-pixbuf-core.h | 9 +-
gdk-pixbuf/gdk-pixbuf-csource.c | 4 +-
gdk-pixbuf/gdk-pixbuf-enum-types.h.template | 2 +-
gdk-pixbuf/gdk-pixbuf-features.h.in | 2 +-
gdk-pixbuf/gdk-pixbuf-io.c | 2414 +++---
gdk-pixbuf/gdk-pixbuf-io.h | 2 +-
gdk-pixbuf/gdk-pixbuf-loader.c | 6 +-
gdk-pixbuf/gdk-pixbuf-loader.h | 2 +-
gdk-pixbuf/gdk-pixbuf-simple-anim.h | 2 +-
gdk-pixbuf/gdk-pixbuf-transform.h | 2 +-
gdk-pixbuf/gdk-pixbuf.c | 33 -
gdk-pixbuf/gdk-pixbuf.symbols | 8 -
gdk-pixbuf/io-png.c | 10 +-
gdk-pixbuf/make-inline-pixbuf.c | 2 +-
gdk-pixbuf/queryloaders.c | 506 +-
gdk/Makefile.am | 89 +-
gdk/abicheck.sh | 4 +-
gdk/directfb/gdkcolor-directfb.c | 77 -
gdk/directfb/gdkdirectfb.h | 9 -
gdk/directfb/gdkdnd-directfb.c | 12 -
gdk/directfb/gdkevents-directfb.c | 30 -
gdk/directfb/gdkimage-directfb.c | 36 +-
gdk/directfb/gdkmain-directfb.c | 11 -
gdk/directfb/gdkwindow-directfb.c | 228 -
gdk/gdk.c | 48 +-
gdk/gdk.h | 23 +-
gdk/gdk.symbols | 331 +-
gdk/gdkcairo.h | 2 +-
gdk/gdkcolor.c | 152 +-
gdk/gdkcolor.h | 53 +-
gdk/gdkcursor.h | 9 +-
gdk/gdkdevice.c | 1399 ++++
gdk/gdkdevice.h | 292 +
gdk/gdkdevicemanager.c | 302 +
gdk/gdkdevicemanager.h | 76 +
gdk/gdkdeviceprivate.h | 131 +
gdk/gdkdisplay.c | 1101 ++-
gdk/gdkdisplay.h | 126 +-
gdk/gdkdisplaymanager.h | 2 +-
gdk/gdkdnd.c | 73 +
gdk/gdkdnd.h | 38 +-
gdk/gdkdrawable.h | 2 +-
gdk/gdkenumtypes.h.template | 2 +-
gdk/gdkevents.c | 333 +-
gdk/gdkevents.h | 83 +-
gdk/gdkgc.c | 53 -
gdk/gdkgc.h | 24 +-
gdk/gdkglobals.c | 1 +
gdk/gdki18n.h | 59 -
gdk/gdkimage.c | 227 +-
gdk/gdkimage.h | 58 +-
gdk/gdkinput.h | 138 +-
gdk/gdkinternals.h | 106 +-
gdk/gdkkeys.h | 4 +-
gdk/gdkoffscreenwindow.c | 35 +-
gdk/gdkpango.c | 18 -
gdk/gdkpango.h | 6 +-
gdk/gdkpixbuf-render.c | 91 -
gdk/gdkpixbuf.h | 29 +-
gdk/gdkpixmap.h | 12 +-
gdk/gdkproperty.h | 2 +-
gdk/gdkregion.h | 2 +-
gdk/gdkrgb.c | 45 -
gdk/gdkrgb.h | 13 +-
gdk/gdkscreen.h | 14 +-
gdk/gdkselection.h | 10 +-
gdk/gdkspawn.h | 2 +-
gdk/gdktypes.h | 107 +-
gdk/gdkvisual.c | 189 +
gdk/gdkvisual.h | 57 +-
gdk/gdkwindow.c | 1430 +++-
gdk/gdkwindow.h | 445 +-
gdk/gdkwindowimpl.h | 14 +-
gdk/makefile.msc | 1 -
gdk/makegdkalias.pl | 2 +-
gdk/quartz/GdkQuartzView.c | 38 +-
gdk/quartz/Makefile.am | 2 +
gdk/quartz/gdkcolor-quartz.c | 44 -
gdk/quartz/gdkdevice-core.c | 356 +
gdk/quartz/gdkdevice-core.h | 51 +
gdk/quartz/gdkdevicemanager-core.c | 130 +
gdk/quartz/gdkdevicemanager-core.h | 54 +
gdk/quartz/gdkdisplay-quartz.c | 11 +
gdk/quartz/gdkdnd-quartz.c | 12 -
gdk/quartz/gdkeventloop-quartz.c | 1 +
gdk/quartz/gdkevents-quartz.c | 459 +-
gdk/quartz/gdkim-quartz.c | 1 -
gdk/quartz/gdkimage-quartz.c | 10 -
gdk/quartz/gdkinput.c | 310 +-
gdk/quartz/gdkinputprivate.h | 5 -
gdk/quartz/gdkmain-quartz.c | 13 -
gdk/quartz/gdkprivate-quartz.h | 3 +-
gdk/quartz/gdkwindow-quartz.c | 153 +-
gdk/testgdk.c | 54 +-
gdk/tests/Makefile.am | 2 +-
gdk/win32/Makefile.am | 8 +-
gdk/win32/gdkcolor-win32.c | 107 +-
gdk/win32/gdkdevice-win32.c | 396 +
gdk/win32/gdkdevice-win32.h | 51 +
gdk/win32/gdkdevice-wintab.c | 386 +
gdk/win32/gdkdevice-wintab.h | 79 +
gdk/win32/gdkdevicemanager-win32.c | 1089 +++
gdk/win32/gdkdevicemanager-win32.h | 59 +
gdk/win32/gdkdnd-win32.c | 222 +-
gdk/win32/gdkevents-win32.c | 291 +-
gdk/win32/gdkim-win32.c | 1 -
gdk/win32/gdkimage-win32.c | 35 -
gdk/win32/gdkinput-win32.c | 1392 ----
gdk/win32/gdkinput-win32.h | 147 -
gdk/win32/gdkinput.c | 379 +-
gdk/win32/gdkmain-win32.c | 15 +-
gdk/win32/gdkwin32.h | 2 -
gdk/win32/gdkwindow-win32.c | 292 +-
gdk/x11/Makefile.am | 33 +-
gdk/x11/gdkcolor-x11.c | 226 +-
gdk/x11/gdkdevice-core.c | 501 ++
gdk/x11/gdkdevice-core.h | 52 +
gdk/x11/gdkdevice-xi.c | 624 ++
gdk/x11/gdkdevice-xi.h | 88 +
gdk/x11/gdkdevice-xi2.c | 621 ++
gdk/x11/gdkdevice-xi2.h | 64 +
gdk/x11/gdkdevicemanager-core.c | 904 +++
gdk/x11/gdkdevicemanager-core.h | 54 +
gdk/x11/gdkdevicemanager-x11.c | 76 +
gdk/x11/gdkdevicemanager-xi.c | 661 ++
gdk/x11/gdkdevicemanager-xi.h | 57 +
gdk/x11/gdkdevicemanager-xi2.c | 1146 +++
gdk/x11/gdkdevicemanager-xi2.h | 61 +
gdk/x11/gdkdisplay-x11.c | 1307 +++-
gdk/x11/gdkdnd-x11.c | 138 +-
gdk/x11/gdkevents-x11.c | 3126 --------
gdk/x11/gdkeventsource.c | 432 +
gdk/x11/gdkeventsource.h | 46 +
gdk/x11/gdkeventtranslator.c | 100 +
gdk/x11/gdkeventtranslator.h | 65 +
gdk/x11/gdkimage-x11.c | 56 -
gdk/x11/gdkinput-none.c | 126 -
gdk/x11/gdkinput-x11.c | 937 ---
gdk/x11/gdkinput-xfree.c | 422 -
gdk/x11/gdkinput.c | 424 +-
gdk/x11/gdkinputprivate.h | 189 -
gdk/x11/gdkmain-x11.c | 277 +-
gdk/x11/gdkprivate-x11.h | 7 +-
gdk/x11/gdkscreen-x11.c | 680 ++-
gdk/x11/gdkwindow-x11.c | 500 +-
gdk/x11/gdkwindow-x11.h | 2 +
gdk/x11/gdkx.h | 5 -
...uninstalled.pc.in => gtk+-3.0-uninstalled.pc.in | 2 +-
gtk+-2.0.pc.in => gtk+-3.0.pc.in | 4 +-
...ix-print-2.0.pc.in => gtk+-unix-print-3.0.pc.in | 4 +-
gtk-zip.sh.in | 42 +-
gtk/Makefile.am | 191 +-
gtk/abicheck.sh | 2 +-
...gtk-builder-convert => gtk-builder-convert-3.0} | 6 +-
gtk/gtk.h | 27 +-
gtk/gtk.symbols | 910 +--
gtk/gtkaboutdialog.c | 259 +-
gtk/gtkaboutdialog.h | 11 +-
gtk/gtkaccelgroup.c | 114 +-
gtk/gtkaccelgroup.h | 39 +-
gtk/gtkaccelgroupprivate.h | 36 +
gtk/gtkaccellabel.c | 154 +-
gtk/gtkaccellabel.h | 19 +-
gtk/gtkaccelmap.c | 4 +-
gtk/gtkaccelmap.h | 2 +-
gtk/gtkaccessible.h | 2 +-
gtk/gtkaction.c | 180 +-
gtk/gtkaction.h | 14 +-
gtk/gtkactiongroup.c | 2 +-
gtk/gtkactiongroup.h | 2 +-
gtk/gtkactivatable.h | 2 +-
gtk/gtkadjustment.c | 6 +-
gtk/gtkadjustment.h | 2 +-
gtk/gtkalignment.c | 206 +-
gtk/gtkalignment.h | 2 +-
gtk/gtkapplication.c | 529 ++
gtk/gtkapplication.h | 100 +
gtk/gtkarrow.c | 37 +
gtk/gtkarrow.h | 2 +-
gtk/gtkaspectframe.c | 46 +
gtk/gtkaspectframe.h | 2 +-
gtk/gtkassistant.c | 103 +-
gtk/gtkassistant.h | 34 +-
gtk/gtkbbox.c | 112 +-
gtk/gtkbbox.h | 24 +-
gtk/gtkbin.c | 134 +-
gtk/gtkbin.h | 2 +-
gtk/gtkbindings.c | 47 -
gtk/gtkbindings.h | 10 +-
gtk/gtkbox.c | 1124 ++-
gtk/gtkbox.h | 40 +-
gtk/gtkbuildable.c | 19 +
gtk/gtkbuildable.h | 51 +-
gtk/gtkbuilder.c | 218 +
gtk/gtkbuilder.h | 33 +-
gtk/gtkbutton.c | 184 +-
gtk/gtkbutton.h | 2 +-
gtk/gtkcalendar.c | 46 -
gtk/gtkcalendar.h | 15 +-
gtk/gtkcelleditable.h | 2 +-
gtk/gtkcelllayout.h | 2 +-
gtk/gtkcellrenderer.c | 22 -
gtk/gtkcellrenderer.h | 9 +-
gtk/gtkcellrendereraccel.c | 89 +-
gtk/gtkcellrendereraccel.h | 2 +-
gtk/gtkcellrenderercombo.h | 2 +-
gtk/gtkcellrendererpixbuf.c | 157 +-
gtk/gtkcellrendererpixbuf.h | 2 +-
gtk/gtkcellrendererprogress.h | 2 +-
gtk/gtkcellrendererspin.h | 2 +-
gtk/gtkcellrenderertext.h | 2 +-
gtk/gtkcellrenderertoggle.h | 2 +-
gtk/gtkcellview.c | 20 -
gtk/gtkcellview.h | 5 +-
gtk/gtkcheckbutton.h | 2 +-
gtk/gtkcheckmenuitem.c | 11 -
gtk/gtkcheckmenuitem.h | 8 +-
gtk/gtkclipboard.c | 5 +-
gtk/gtkclipboard.h | 2 +-
gtk/gtkclist.c | 7806 ------------------
gtk/gtkclist.h | 792 --
gtk/gtkcolorbutton.h | 2 +-
gtk/gtkcolorsel.c | 177 +-
gtk/gtkcolorsel.h | 18 +-
gtk/gtkcolorseldialog.h | 2 +-
gtk/gtkcombo.c | 1234 ---
gtk/gtkcombo.h | 118 -
gtk/gtkcombobox.c | 128 +-
gtk/gtkcombobox.h | 4 +-
gtk/gtkcomboboxentry.h | 2 +-
gtk/gtkcontainer.c | 60 +-
gtk/gtkcontainer.h | 16 +-
gtk/gtkctree.c | 6144 ---------------
gtk/gtkctree.h | 445 --
gtk/gtkcurve.c | 1039 ---
gtk/gtkcurve.h | 106 -
gtk/gtkdebug.h | 27 +-
gtk/gtkdialog.h | 2 +-
gtk/gtkdnd-quartz.c | 10 -
gtk/gtkdnd.c | 467 +-
gtk/gtkdnd.h | 10 +-
gtk/gtkdrawingarea.c | 13 -
gtk/gtkdrawingarea.h | 9 +-
gtk/gtkeditable.c | 2 +-
gtk/gtkeditable.h | 2 +-
gtk/gtkentry.c | 207 +-
gtk/gtkentry.h | 25 +-
gtk/gtkentrybuffer.h | 2 +-
gtk/gtkentrycompletion.c | 85 +-
gtk/gtkentrycompletion.h | 2 +-
gtk/gtkentryprivate.h | 5 +-
gtk/gtkenums.h | 111 +-
gtk/gtkeventbox.h | 2 +-
gtk/gtkexpander.h | 2 +-
gtk/gtkextendedlayout.c | 534 ++
gtk/gtkextendedlayout.h | 89 +
gtk/gtkfilechooser.c | 12 +-
gtk/gtkfilechooser.h | 4 +-
gtk/gtkfilechooserbutton.c | 32 -
gtk/gtkfilechooserbutton.h | 9 +-
gtk/gtkfilechooserdefault.c | 8 +-
gtk/gtkfilechooserdialog.c | 47 +-
gtk/gtkfilechooserdialog.h | 11 +-
gtk/gtkfilechooserutils.c | 3 -
gtk/gtkfilechooserutils.h | 3 +-
gtk/gtkfilechooserwidget.c | 29 -
gtk/gtkfilechooserwidget.h | 8 +-
gtk/gtkfilefilter.h | 2 +-
gtk/gtkfilesel.c | 3999 ----------
gtk/gtkfilesel.h | 125 -
gtk/gtkfilesystemmodel.c | 1 +
gtk/gtkfixed.c | 48 -
gtk/gtkfixed.h | 8 +-
gtk/gtkfontbutton.h | 2 +-
gtk/gtkfontsel.c | 57 -
gtk/gtkfontsel.h | 16 +-
gtk/gtkframe.c | 158 +-
gtk/gtkframe.h | 2 +-
gtk/gtkgamma.c | 494 --
gtk/gtkgamma.h | 82 -
gtk/gtkgc.h | 2 +-
gtk/gtkhandlebox.c | 38 +-
gtk/gtkhandlebox.h | 2 +-
gtk/gtkhbbox.c | 40 -
gtk/gtkhbbox.h | 10 +-
gtk/gtkhbox.c | 25 +
gtk/gtkhbox.h | 2 +-
gtk/gtkhpaned.h | 2 +-
gtk/gtkhruler.h | 2 +-
gtk/gtkhscale.h | 2 +-
gtk/gtkhscrollbar.h | 2 +-
gtk/gtkhseparator.h | 2 +-
gtk/gtkiconfactory.c | 1 -
gtk/gtkiconfactory.h | 2 +-
gtk/gtkicontheme.c | 140 +
gtk/gtkicontheme.h | 9 +-
gtk/gtkiconview.c | 173 +-
gtk/gtkiconview.h | 6 +-
gtk/gtkimage.c | 177 +-
gtk/gtkimage.h | 13 +-
gtk/gtkimagemenuitem.c | 4 +-
gtk/gtkimagemenuitem.h | 2 +-
gtk/gtkimcontext.c | 2 +-
gtk/gtkimcontext.h | 2 +-
gtk/gtkimcontextsimple.h | 2 +-
gtk/gtkimmulticontext.h | 2 +-
gtk/gtkinputdialog.c | 764 --
gtk/gtkinputdialog.h | 100 -
gtk/gtkinvisible.c | 2 +-
gtk/gtkinvisible.h | 2 +-
gtk/gtkitem.h | 2 +-
gtk/gtkitemfactory.c | 1586 ----
gtk/gtkitemfactory.h | 236 -
gtk/gtklabel.c | 777 ++-
gtk/gtklabel.h | 16 +-
gtk/gtklayout.c | 36 -
gtk/gtklayout.h | 16 +-
gtk/gtklinkbutton.h | 2 +-
gtk/gtklist.c | 2587 ------
gtk/gtklist.h | 138 -
gtk/gtklistitem.c | 635 --
gtk/gtklistitem.h | 91 -
gtk/gtkliststore.h | 2 +-
gtk/gtkmain.c | 582 +-
gtk/gtkmain.h | 58 +-
gtk/gtkmarshal.list | 36 -
gtk/gtkmarshalers.list | 1 +
gtk/gtkmenu.c | 248 +-
gtk/gtkmenu.h | 17 +-
gtk/gtkmenubar.h | 8 +-
gtk/gtkmenuitem.c | 18 -
gtk/gtkmenuitem.h | 7 +-
gtk/gtkmenushell.c | 51 +-
gtk/gtkmenushell.h | 10 +-
gtk/gtkmenutoolbutton.c | 33 +-
gtk/gtkmenutoolbutton.h | 10 +-
gtk/gtkmessagedialog.c | 47 +
gtk/gtkmessagedialog.h | 39 +-
gtk/gtkmisc.h | 2 +-
gtk/gtkmodules.c | 6 +-
gtk/gtkmodules.h | 2 +-
gtk/gtknotebook.c | 291 +-
gtk/gtknotebook.h | 26 +-
gtk/gtkobject.c | 739 +--
gtk/gtkobject.h | 155 +-
gtk/gtkoldeditable.c | 829 --
gtk/gtkoldeditable.h | 126 -
gtk/gtkoptionmenu.c | 1036 ---
gtk/gtkoptionmenu.h | 88 -
gtk/gtkorientable.c | 16 +
gtk/gtkpagesetup.h | 2 +-
gtk/gtkpagesetupunixdialog.c | 15 +
gtk/gtkpagesetupunixdialog.h | 2 +-
gtk/gtkpaned.c | 54 +-
gtk/gtkpaned.h | 12 +-
gtk/gtkpapersize.c | 9 +-
gtk/gtkpapersize.h | 2 +-
gtk/gtkpathbar.c | 29 +-
gtk/gtkpixmap.c | 286 -
gtk/gtkpixmap.h | 83 -
gtk/gtkplug-x11.c | 72 +-
gtk/gtkplug.h | 2 +-
gtk/gtkpreview.c | 565 --
gtk/gtkpreview.h | 137 -
gtk/gtkprintcontext.h | 2 +-
gtk/gtkprinter.c | 19 +
gtk/gtkprinter.h | 15 +-
gtk/gtkprinteroptionwidget.c | 2 +-
gtk/gtkprintjob.h | 8 +-
gtk/gtkprintoperation-unix.c | 42 +-
gtk/gtkprintoperation.c | 50 +-
gtk/gtkprintoperation.h | 2 +-
gtk/gtkprintoperationpreview.h | 2 +-
gtk/gtkprintsettings.h | 2 +-
gtk/gtkprintunixdialog.h | 2 +-
gtk/gtkprivate.h | 58 +-
gtk/gtkprogress.c | 6 +-
gtk/gtkprogressbar.c | 298 +-
gtk/gtkprogressbar.h | 50 +-
gtk/gtkradioaction.c | 71 +-
gtk/gtkradioaction.h | 4 +-
gtk/gtkradiobutton.c | 127 +-
gtk/gtkradiobutton.h | 6 +-
gtk/gtkradiomenuitem.h | 6 +-
gtk/gtkradiotoolbutton.h | 2 +-
gtk/gtkrange.c | 121 +-
gtk/gtkrange.h | 2 +-
gtk/gtkrc.c | 191 +-
gtk/gtkrc.h | 21 +-
gtk/gtkrecentaction.c | 17 +
gtk/gtkrecentaction.h | 2 +-
gtk/gtkrecentchooser.c | 83 +-
gtk/gtkrecentchooser.h | 28 +-
gtk/gtkrecentchooserdialog.c | 46 +
gtk/gtkrecentchooserdialog.h | 2 +-
gtk/gtkrecentchoosermenu.c | 28 +
gtk/gtkrecentchoosermenu.h | 2 +-
gtk/gtkrecentchooserwidget.c | 19 +
gtk/gtkrecentchooserwidget.h | 2 +-
gtk/gtkrecentfilter.h | 2 +-
gtk/gtkrecentmanager.c | 52 -
gtk/gtkrecentmanager.h | 8 +-
gtk/gtkruler.c | 4 +-
gtk/gtkruler.h | 3 +-
gtk/gtkscale.c | 25 +-
gtk/gtkscale.h | 8 +-
gtk/gtkscalebutton.c | 197 +-
gtk/gtkscalebutton.h | 10 +-
gtk/gtkscrollbar.c | 6 +-
gtk/gtkscrollbar.h | 4 +-
gtk/gtkscrolledwindow.c | 313 +-
gtk/gtkscrolledwindow.h | 2 +-
gtk/gtkselection.c | 10 +-
gtk/gtkselection.h | 6 +-
gtk/gtkseparator.c | 21 +-
gtk/gtkseparator.h | 4 +-
gtk/gtkseparatormenuitem.c | 19 +
gtk/gtkseparatormenuitem.h | 2 +-
gtk/gtkseparatortoolitem.c | 20 +
gtk/gtkseparatortoolitem.h | 2 +-
gtk/gtksettings.c | 29 +-
gtk/gtksettings.h | 2 +-
gtk/gtksignal.c | 394 -
gtk/gtksignal.h | 149 -
gtk/gtksizegroup.c | 216 +-
gtk/gtksizegroup.h | 13 +-
gtk/gtksocket.c | 99 +-
gtk/gtksocket.h | 7 +-
gtk/gtkspinbutton.c | 15 +-
gtk/gtkspinbutton.h | 7 +-
gtk/gtkstatusbar.c | 66 +
gtk/gtkstatusbar.h | 5 +-
gtk/gtkstatusicon.c | 101 +-
gtk/gtkstatusicon.h | 6 +-
gtk/gtkstock.h | 2 +-
gtk/gtkstyle.c | 863 +--
gtk/gtkstyle.h | 221 +-
gtk/gtktable.h | 2 +-
gtk/gtktearoffmenuitem.h | 2 +-
gtk/gtktestutils.c | 8 +-
gtk/gtktext.c | 5461 -------------
gtk/gtktext.h | 217 -
gtk/gtktextbuffer.c | 2 +-
gtk/gtktextbuffer.h | 2 +-
gtk/gtktextbufferrichtext.h | 2 +-
gtk/gtktextchild.h | 2 +-
gtk/gtktextiter.c | 12 +
gtk/gtktextiter.h | 2 +-
gtk/gtktextmark.h | 2 +-
gtk/gtktexttag.h | 2 +-
gtk/gtktexttagtable.h | 2 +-
gtk/gtktextview.c | 177 +-
gtk/gtktextview.h | 9 +-
gtk/gtktipsquery.c | 524 --
gtk/gtktipsquery.h | 110 -
gtk/gtktoggleaction.c | 21 +-
gtk/gtktoggleaction.h | 2 +-
gtk/gtktogglebutton.h | 6 +-
gtk/gtktoggletoolbutton.h | 2 +-
gtk/gtktoolbar.c | 1512 +----
gtk/gtktoolbar.h | 140 +-
gtk/gtktoolbutton.c | 8 +-
gtk/gtktoolbutton.h | 2 +-
gtk/gtktoolitem.c | 81 +-
gtk/gtktoolitem.h | 18 +-
gtk/gtktoolshell.c | 8 +-
gtk/gtktooltip.c | 189 +-
gtk/gtktooltip.h | 8 +-
gtk/gtktooltips.c | 338 -
gtk/gtktooltips.h | 109 -
gtk/gtktrayicon-x11.c | 265 +-
gtk/gtktrayicon.h | 3 +-
gtk/gtktree.c | 1136 ---
gtk/gtktree.h | 132 -
gtk/gtktreednd.c | 24 +
gtk/gtktreednd.h | 2 +-
gtk/gtktreeitem.c | 1000 ---
gtk/gtktreeitem.h | 90 -
gtk/gtktreemodel.c | 29 +-
gtk/gtktreemodel.h | 15 +-
gtk/gtktreemodelfilter.c | 77 +-
gtk/gtktreemodelfilter.h | 13 +-
gtk/gtktreemodelsort.h | 2 +-
gtk/gtktreeprivate.h | 3 +-
gtk/gtktreeselection.c | 2 +-
gtk/gtktreeselection.h | 2 +-
gtk/gtktreesortable.h | 2 +-
gtk/gtktreestore.h | 2 +-
gtk/gtktreeview.c | 201 +-
gtk/gtktreeview.h | 15 +-
gtk/gtktreeviewcolumn.c | 20 +-
gtk/gtktreeviewcolumn.h | 5 +-
gtk/gtktypebuiltins.c.template | 1 -
gtk/gtktypebuiltins.h.template | 2 +-
gtk/gtktypeutils.c | 168 -
gtk/gtktypeutils.h | 167 +-
gtk/gtkuimanager.h | 2 +-
gtk/gtkvbbox.c | 71 +-
gtk/gtkvbbox.h | 13 +-
gtk/gtkvbox.h | 2 +-
gtk/gtkversion.h.in | 2 +-
gtk/gtkviewport.c | 139 +-
gtk/gtkviewport.h | 2 +-
gtk/gtkvolumebutton.c | 10 +
gtk/gtkvolumebutton.h | 2 +-
gtk/gtkvpaned.c | 18 +
gtk/gtkvpaned.h | 2 +-
gtk/gtkvruler.c | 29 +
gtk/gtkvruler.h | 2 +-
gtk/gtkvscale.h | 2 +-
gtk/gtkvscrollbar.h | 2 +-
gtk/gtkvseparator.h | 2 +-
gtk/gtkwidget.c | 1041 ++-
gtk/gtkwidget.h | 436 +-
gtk/gtkwin32embedwidget.c | 2 +-
gtk/gtkwindow.c | 404 +-
gtk/gtkwindow.h | 27 +-
gtk/makefile.msc.in | 6 -
gtk/queryimmodules.c | 177 +-
gtk/tests/Makefile.am | 22 +-
gtk/tests/builder.c | 8 +-
gtk/tests/defaultvalue.c | 23 +-
{tests => gtk/tests}/file-chooser-test-dir/empty | 0
.../tests}/file-chooser-test-dir/text.txt | 0
gtk/tests/filechooser.c | 2 -
gtk/tests/floating.c | 18 +-
gtk/tests/gtk-example-application.c | 60 +
gtk/tests/object.c | 1 -
gtk/tests/pixbuf-init.c | 2 +-
gtk/tests/testing.c | 3 +-
m4macros/Makefile.am | 2 +-
m4macros/{gtk-2.0.m4 => gtk-3.0.m4} | 20 +-
modules/engines/ms-windows/Makefile.am | 4 +-
modules/engines/ms-windows/Theme/Makefile.am | 2 +-
.../Theme/{gtk-2.0 => gtk-3.0}/Makefile.am | 0
.../ms-windows/Theme/{gtk-2.0 => gtk-3.0}/gtkrc | 0
modules/engines/ms-windows/msw_style.c | 5 +-
modules/engines/pixbuf/Makefile.am | 10 +-
modules/engines/pixbuf/pixbuf-draw.c | 39 -
modules/input/Makefile.am | 30 +-
modules/other/gail/Makefile.am | 18 +-
modules/other/gail/gail.c | 23 +-
modules/other/gail/gail.h | 6 -
modules/other/gail/gailbooleancell.c | 3 +-
modules/other/gail/gailcell.c | 13 +-
modules/other/gail/gailcheckmenuitem.c | 14 +-
modules/other/gail/gailchecksubmenuitem.c | 14 +-
modules/other/gail/gailclist.c | 1609 ----
modules/other/gail/gailclist.h | 64 -
modules/other/gail/gailclistcell.c | 106 -
modules/other/gail/gailclistcell.h | 54 -
modules/other/gail/gailcombo.c | 639 --
modules/other/gail/gailcombo.h | 58 -
modules/other/gail/gailentry.c | 13 +-
modules/other/gail/gailitem.c | 9 -
modules/other/gail/gaillabel.c | 22 +-
modules/other/gail/gaillist.c | 242 -
modules/other/gail/gaillist.h | 51 -
modules/other/gail/gailmenu.c | 4 +-
modules/other/gail/gailmenuitem.c | 10 +-
modules/other/gail/gailoptionmenu.c | 356 -
modules/other/gail/gailoptionmenu.h | 51 -
modules/other/gail/gailpixmap.c | 158 -
modules/other/gail/gailpixmap.h | 54 -
modules/other/gail/gailtogglebutton.c | 14 +-
modules/other/gail/gailtoplevel.c | 5 -
modules/other/gail/gailwidget.c | 39 +-
modules/other/gail/gailwindow.c | 4 +-
modules/other/gail/libgail-util/Makefile.am | 18 +-
modules/other/gail/libgail-util/gailmisc.c | 12 +
modules/other/gail/libgail-util/gailtextutil.c | 15 +
modules/other/gail/tests/Makefile.am | 15 +-
modules/other/gail/tests/README | 8 -
modules/other/gail/tests/ferret.c | 7 +-
modules/other/gail/tests/testcombo.c | 12 +-
modules/other/gail/tests/testoptionmenu.c | 157 -
modules/printbackends/cups/Makefile.am | 2 +-
modules/printbackends/cups/gtkcupsutils.c | 18 +-
modules/printbackends/cups/gtkcupsutils.h | 1 +
modules/printbackends/cups/gtkprintbackendcups.c | 7 +-
modules/printbackends/file/Makefile.am | 2 +-
modules/printbackends/lpr/Makefile.am | 4 +-
modules/printbackends/test/Makefile.am | 2 +-
perf/Makefile.am | 2 +-
po-properties/Makefile.in.in | 1 +
po-properties/POTFILES.in | 19 -
po-properties/af.po | 2566 +++---
po-properties/am.po | 2392 +++---
po-properties/ang.po | 2366 +++---
po-properties/ar.po | 2551 +++---
po-properties/as.po | 2565 +++---
po-properties/ast.po | 2578 +++---
po-properties/az.po | 2561 +++---
po-properties/az_IR.po | 2366 +++---
po-properties/be.po | 2568 +++---
po-properties/be latin po | 2579 +++---
po-properties/bg.po | 2568 +++---
po-properties/bn.po | 3974 +++++-----
po-properties/bn_IN.po | 4146 +++++-----
po-properties/br.po | 2385 +++---
po-properties/bs.po | 2568 +++---
po-properties/ca.po | 3912 +++++-----
po-properties/ca valencia po | 2961 ++++----
po-properties/crh.po | 2891 ++++----
po-properties/cs.po | 2559 +++---
po-properties/cy.po | 2576 +++---
po-properties/da.po | 2563 +++---
po-properties/de.po | 2566 +++---
po-properties/dz.po | 2556 +++---
po-properties/el.po | 2567 +++---
po-properties/en shaw po | 3704 +++++++---
po-properties/en_CA.po | 2561 +++---
po-properties/en_GB.po | 2562 +++---
po-properties/eo.po | 4717 ++++++------
po-properties/es.po | 2575 +++---
po-properties/et.po | 2483 +++---
po-properties/eu.po | 2913 ++++----
po-properties/fa.po | 2446 +++---
po-properties/fi.po | 2558 +++---
po-properties/fr.po | 2587 +++---
po-properties/ga.po | 2394 +++---
po-properties/gl.po | 2583 +++---
po-properties/gu.po | 2557 +++---
po-properties/he.po | 2648 ++++----
po-properties/hi.po | 2551 +++---
po-properties/hr.po | 2560 +++---
po-properties/hu.po | 2564 +++---
po-properties/hy.po | 2374 +++---
po-properties/ia.po | 2378 +++---
po-properties/id.po | 4225 +++++------
po-properties/io.po | 2366 +++---
po-properties/is.po | 2378 +++---
po-properties/it.po | 2585 +++---
po-properties/ja.po | 2551 +++---
po-properties/ka.po | 2552 +++---
po-properties/kk.po | 8247 ++++++++++++++++++++
po-properties/kn.po | 2594 +++----
po-properties/ko.po | 2557 +++---
po-properties/ku.po | 2378 +++---
po-properties/li.po | 2561 +++---
po-properties/lt.po | 2561 +++---
po-properties/lv.po | 2550 +++---
po-properties/mai.po | 2551 +++---
po-properties/mi.po | 2369 +++---
po-properties/mk.po | 2561 +++---
po-properties/ml.po | 2552 +++---
po-properties/mn.po | 2647 ++++----
po-properties/mr.po | 4100 +++++-----
po-properties/ms.po | 2565 +++---
po-properties/my.po | 2559 +++---
po-properties/nb.po | 2560 +++---
po-properties/nds.po | 2643 ++++----
po-properties/ne.po | 2548 +++---
po-properties/nl.po | 2574 +++---
po-properties/nn.po | 2576 +++---
po-properties/nso.po | 2587 +++---
po-properties/oc.po | 2373 +++---
po-properties/or.po | 2419 +++----
po-properties/pa.po | 2554 +++---
po-properties/pl.po | 2579 +++---
po-properties/ps.po | 2422 +++---
po-properties/pt.po | 2569 +++---
po-properties/pt_BR.po | 2562 +++---
po-properties/ro.po | 2577 +++---
po-properties/ru.po | 2570 +++---
po-properties/rw.po | 2586 +++----
po-properties/si.po | 2383 +++---
po-properties/sk.po | 2556 +++---
po-properties/sl.po | 2564 +++---
po-properties/sq.po | 2593 +++---
po-properties/sr.po | 2567 +++---
po-properties/sr ije po | 2568 +++---
po-properties/sr latin po | 2567 +++---
po-properties/sv.po | 2562 +++---
po-properties/ta.po | 2560 +++---
po-properties/te.po | 2551 +++---
po-properties/th.po | 2367 +++---
po-properties/tk.po | 2374 +++---
po-properties/tr.po | 2655 ++++----
po-properties/tt.po | 2390 +++---
po-properties/uk.po | 3909 +++++-----
po-properties/ur.po | 2373 +++---
po-properties/uz.po | 2391 +++---
po-properties/uz cyrillic po | 2391 +++---
po-properties/vi.po | 2569 +++---
po-properties/wa.po | 2443 +++---
po-properties/xh.po | 2580 +++---
po-properties/yi.po | 2559 +++---
po-properties/zh_CN.po | 2551 +++---
po-properties/zh_HK.po | 2551 +++---
po-properties/zh_TW.po | 2551 +++---
po/LINGUAS | 1 +
po/Makefile.in.in | 1 +
po/POTFILES.in | 19 -
po/af.po | 894 +--
po/am.po | 821 +--
po/ang.po | 787 +--
po/ar.po | 892 +--
po/as.po | 892 +--
po/ast.po | 898 +--
po/az.po | 913 +--
po/az_IR.po | 727 +--
po/be.po | 913 +--
po/be latin po | 892 +--
po/bg.po | 896 +--
po/bn.po | 2553 +++----
po/bn_IN.po | 2565 +++---
po/br.po | 843 +--
po/bs.po | 918 +--
po/ca.po | 897 +--
po/ca valencia po | 1967 ++++--
po/crh.po | 1130 ++--
po/cs.po | 896 +--
po/cy.po | 897 +--
po/da.po | 2517 +++---
po/de.po | 896 +--
po/dz.po | 892 +--
po/el.po | 2517 +++---
po/en shaw po | 5052 +++++++-----
po/en_CA.po | 893 +--
po/en_GB.po | 893 +--
po/eo.po | 4542 +++++------
po/es.po | 916 +--
po/et.po | 899 +--
po/eu.po | 936 ++--
po/fa.po | 910 +--
po/fi.po | 894 +--
po/fr.po | 898 +--
po/ga.po | 2435 +++----
po/gl.po | 2548 +++----
po/gu.po | 890 +--
po/he.po | 3335 ++++----
po/hi.po | 892 +--
po/hr.po | 905 +--
po/hu.po | 894 +--
po/hy.po | 919 +--
po/ia.po | 883 +--
po/id.po | 2860 ++++----
po/io.po | 849 +--
po/is.po | 906 +--
po/it.po | 910 +--
po/ja.po | 892 +--
po/ka.po | 890 +--
po/kk.po | 5188 ++++++++++++
po/kn.po | 921 +--
po/ko.po | 894 +--
po/ku.po | 891 +--
po/li.po | 928 ++--
po/lt.po | 893 +--
po/lv.po | 1738 ++---
po/mai.po | 888 +--
po/mi.po | 860 +--
po/mk.po | 899 +--
po/ml.po | 894 +--
po/mn.po | 1006 ++--
po/mr.po | 2571 +++---
po/ms.po | 917 +--
po/my.po | 893 +--
po/nb.po | 891 +--
po/nds.po | 878 +--
po/ne.po | 915 +--
po/nl.po | 924 +--
po/nn.po | 911 +--
po/nso.po | 922 +--
po/oc.po | 824 +--
po/or.po | 890 +--
po/pa.po | 888 +--
po/pl.po | 896 +--
po/ps.po | 852 +--
po/pt.po | 898 +--
po/pt_BR.po | 898 +--
po/ro.po | 895 +--
po/ru.po | 890 +--
po/rw.po | 950 ++--
po/si.po | 887 +--
po/sk.po | 890 +--
po/sl.po | 892 +--
po/sq.po | 901 +--
po/sr.po | 894 +--
po/sr ije po | 918 +--
po/sr latin po | 894 +--
po/sv.po | 897 +--
po/ta.po | 890 +--
po/te.po | 892 +--
po/th.po | 888 +--
po/tk.po | 822 +--
po/tr.po | 983 ++--
po/tt.po | 848 +--
po/uk.po | 2522 +++---
po/ur.po | 730 +--
po/uz.po | 831 +--
po/uz cyrillic po | 831 +--
po/vi.po | 891 +--
po/wa.po | 898 +--
po/xh.po | 920 +--
po/yi.po | 921 +--
po/zh_CN.po | 886 +--
po/zh_HK.po | 886 +--
po/zh_TW.po | 886 +--
sanity_check | 4 +-
tests/Makefile.am | 41 +-
tests/extendedlayoutexample.c | 620 ++
tests/prop-editor.c | 1 +
tests/stresstest-toolbar.c | 12 +-
tests/testapplication.c | 105 +
tests/testapplication.desktop | 6 +
tests/testcombochange.c | 4 +-
tests/testdnd.c | 4 +-
tests/testellipsise.c | 121 +-
tests/testgtk.c | 3891 +---------
tests/testgtkrc | 1 -
tests/testiconview-keynav.c | 280 +
tests/testinput.c | 41 -
tests/testmenubars.c | 8 +-
tests/testmenus.c | 246 -
tests/testoffscreen.c | 24 +-
tests/testselection.c | 39 +-
tests/testsocket.c | 62 +-
tests/testsocket_common.c | 90 +-
tests/testtext.c | 8 +-
tests/testtoolbar.c | 54 +-
tests/testtreeview.c | 79 +-
1138 files changed, 241055 insertions(+), 302684 deletions(-)
---
diff --cc gtk/gtk.symbols
index 5301ebf,6439b90..3bb7964
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@@ -1038,99 -885,8 +885,9 @@@ gtk_container_unset_focus_chai
#endif
#endif
- #if IN_HEADER(__GTK_CTREE_H__)
- #if IN_FILE(__GTK_CTREE_C__)
- #ifndef GTK_DISABLE_DEPRECATED
- gtk_ctree_collapse
- gtk_ctree_collapse_recursive
- gtk_ctree_collapse_to_depth
- gtk_ctree_expand
- gtk_ctree_expand_recursive
- gtk_ctree_expand_to_depth
- gtk_ctree_export_to_gnode
- gtk_ctree_find
- gtk_ctree_find_all_by_row_data
- gtk_ctree_find_all_by_row_data_custom
- gtk_ctree_find_by_row_data
- gtk_ctree_find_by_row_data_custom
- gtk_ctree_find_node_ptr
- gtk_ctree_get_node_info
- gtk_ctree_get_type G_GNUC_CONST
- gtk_ctree_insert_gnode
- gtk_ctree_insert_node
- gtk_ctree_is_ancestor
- gtk_ctree_is_hot_spot
- gtk_ctree_is_viewable
- gtk_ctree_last
- gtk_ctree_move
- gtk_ctree_new
- gtk_ctree_new_with_titles
- gtk_ctree_node_get_cell_style
- gtk_ctree_node_get_cell_type
- gtk_ctree_node_get_pixmap
- gtk_ctree_node_get_pixtext
- gtk_ctree_node_get_row_data
- gtk_ctree_node_get_row_style
- gtk_ctree_node_get_selectable
- gtk_ctree_node_get_text
- gtk_ctree_node_get_type G_GNUC_CONST
- gtk_ctree_node_is_visible
- gtk_ctree_node_moveto
- gtk_ctree_node_nth
- gtk_ctree_node_set_background
- gtk_ctree_node_set_cell_style
- gtk_ctree_node_set_foreground
- gtk_ctree_node_set_pixmap
- gtk_ctree_node_set_pixtext
- gtk_ctree_node_set_row_data
- gtk_ctree_node_set_row_data_full
- gtk_ctree_node_set_row_style
- gtk_ctree_node_set_selectable
- gtk_ctree_node_set_shift
- gtk_ctree_node_set_text
- gtk_ctree_post_recursive
- gtk_ctree_post_recursive_to_depth
- gtk_ctree_pre_recursive
- gtk_ctree_pre_recursive_to_depth
- gtk_ctree_real_select_recursive
- gtk_ctree_remove_node
- gtk_ctree_select
- gtk_ctree_select_recursive
- gtk_ctree_set_drag_compare_func
- gtk_ctree_set_expander_style
- gtk_ctree_set_indent
- gtk_ctree_set_line_style
- gtk_ctree_set_node_info
- gtk_ctree_set_show_stub
- gtk_ctree_set_spacing
- gtk_ctree_sort_node
- gtk_ctree_sort_recursive
- gtk_ctree_toggle_expansion
- gtk_ctree_toggle_expansion_recursive
- gtk_ctree_unselect
- gtk_ctree_unselect_recursive
- #endif
- #endif
- #endif
-
- #if IN_HEADER(__GTK_CURVE_H__)
- #if IN_FILE(__GTK_CURVE_C__)
- #ifndef GTK_DISABLE_DEPRECATED
- gtk_curve_get_type G_GNUC_CONST
- gtk_curve_get_vector
- gtk_curve_new
- gtk_curve_reset
- gtk_curve_set_curve_type
- gtk_curve_set_gamma
- gtk_curve_set_range
- gtk_curve_set_vector
- #endif
- #endif
- #endif
-
#if IN_HEADER(__GTK_WINDOW_DECORATE_H__)
#if IN_FILE(__GTK_WINDOW_DECORATE_C__)
+#ifndef GTK_DISABLE_DEPRECATED
gtk_decorated_window_calculate_frame_size
gtk_decorated_window_init
gtk_decorated_window_move_resize_window
diff --cc gtk/gtkwindow.c
index f0830a9,942c30e..f706f3e
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@@ -37,12 -36,9 +37,13 @@@
#include "gtkprivate.h"
#include "gtkrc.h"
+#include "gtkbutton.h"
+#include "gtkeventbox.h"
++#include "gtkextendedlayout.h"
#include "gtkwindow.h"
-#include "gtkwindow-decorate.h"
+#include "gtklabel.h"
#include "gtkbindings.h"
+#include "gtkhbox.h"
#include "gtkkeyhash.h"
#include "gtkmain.h"
#include "gtkmnemonichash.h"
@@@ -229,22 -198,23 +231,37 @@@ struct _GtkWindowPrivat
gdouble opacity;
gchar *startup_id;
+
+ GtkWidget *title_label;
+ GtkWidget *icon_event_box;
+ GtkWidget *title_icon;
+ GtkWidget *min_button;
+ GtkWidget *max_button;
+ GtkWidget *close_button;
+ GtkWidget *primary_box;
+ GtkWidget *secondary_box;
+ gint cursor_region;
+
+ GtkWidget *popup_menu;
+
+ GdkCursor *default_cursor;
};
+ typedef struct _GtkDeviceGrabInfo GtkDeviceGrabInfo;
+ typedef struct _GtkWindowGroupPrivate GtkWindowGroupPrivate;
+
+ struct _GtkDeviceGrabInfo
+ {
+ GtkWidget *widget;
+ GdkDevice *device;
+ guint block_others : 1;
+ };
+
+ struct _GtkWindowGroupPrivate
+ {
+ GSList *device_grabs;
+ };
+
static void gtk_window_dispose (GObject *object);
static void gtk_window_destroy (GtkObject *object);
static void gtk_window_finalize (GObject *object);
@@@ -254,16 -224,16 +271,14 @@@ static void gtk_window_ma
static void gtk_window_unmap (GtkWidget *widget);
static void gtk_window_realize (GtkWidget *widget);
static void gtk_window_unrealize (GtkWidget *widget);
- static void gtk_window_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
static void gtk_window_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static gint gtk_window_event (GtkWidget *widget,
- GdkEvent *event);
static gboolean gtk_window_map_event (GtkWidget *widget,
GdkEventAny *event);
-static gboolean gtk_window_frame_event (GtkWindow *window,
- GdkEvent *event);
static gint gtk_window_configure_event (GtkWidget *widget,
GdkEventConfigure *event);
+static gint gtk_window_state_event (GtkWidget *widget,
+ GdkEventWindowState *event);
static gint gtk_window_key_press_event (GtkWidget *widget,
GdkEventKey *event);
static gint gtk_window_key_release_event (GtkWidget *widget,
@@@ -418,17 -364,20 +433,27 @@@ static void gtk_window_buildable_custom
const gchar *tagname,
gpointer user_data);
+/* GtkContainer */
+static void gtk_window_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
+static void gtk_window_remove (GtkContainer *container,
+ GtkWidget *child);
+ static void gtk_window_extended_layout_init (GtkExtendedLayoutIface *iface);
+ static void gtk_window_get_desired_width (GtkExtendedLayout *layout,
+ gint *minimum_size,
+ gint *natural_size);
+ static void gtk_window_get_desired_height (GtkExtendedLayout *layout,
+ gint *minimum_size,
+ gint *natural_size);
+
G_DEFINE_TYPE_WITH_CODE (GtkWindow, gtk_window, GTK_TYPE_BIN,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
- gtk_window_buildable_interface_init))
+ gtk_window_buildable_interface_init)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
+ gtk_window_extended_layout_init))
static void
add_tab_bindings (GtkBindingSet *binding_set,
@@@ -540,10 -476,8 +565,9 @@@ gtk_window_class_init (GtkWindowClass *
widget_class->unmap = gtk_window_unmap;
widget_class->realize = gtk_window_realize;
widget_class->unrealize = gtk_window_unrealize;
- widget_class->size_request = gtk_window_size_request;
widget_class->size_allocate = gtk_window_size_allocate;
widget_class->configure_event = gtk_window_configure_event;
+ widget_class->window_state_event = gtk_window_state_event;
widget_class->key_press_event = gtk_window_key_press_event;
widget_class->key_release_event = gtk_window_key_release_event;
widget_class->enter_notify_event = gtk_window_enter_notify_event;
@@@ -1159,11 -921,11 +1183,11 @@@
static void
gtk_window_init (GtkWindow *window)
{
- GdkColormap *colormap;
GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window);
-
+ GdkColormap *colormap;
+
gtk_widget_set_has_window (GTK_WIDGET (window), TRUE);
- GTK_WIDGET_SET_FLAGS (window, GTK_TOPLEVEL);
+ _gtk_widget_set_is_toplevel (GTK_WIDGET (window), TRUE);
GTK_PRIVATE_SET_FLAG (window, GTK_ANCHORED);
@@@ -6709,80 -5267,45 +6722,92 @@@ static voi
do_focus_change (GtkWidget *widget,
gboolean in)
{
- GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
+ GdkDeviceManager *device_manager;
+ GList *devices, *d;
- g_object_ref (widget);
+ device_manager = gdk_display_get_device_manager (gtk_widget_get_display (widget));
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
+ devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
- if (in)
- {
- GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
- }
- else
+ for (d = devices; d; d = d->next)
{
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- }
+ GdkDevice *dev = d->data;
+ GdkEvent *fevent;
- fevent->focus_change.type = GDK_FOCUS_CHANGE;
- fevent->focus_change.window = widget->window;
- if (widget->window)
- g_object_ref (widget->window);
- fevent->focus_change.in = in;
-
- gtk_widget_event (widget, fevent);
-
- g_object_notify (G_OBJECT (widget), "has-focus");
+ if (dev->source != GDK_SOURCE_KEYBOARD)
+ continue;
- g_object_unref (widget);
- gdk_event_free (fevent);
+ /* Skip non-master keyboards that haven't
+ * selected for events from this window
+ */
+ if (gdk_device_get_device_type (dev) != GDK_DEVICE_TYPE_MASTER &&
+ widget->window &&
+ !gdk_window_get_device_events (widget->window, dev))
+ continue;
+
+ fevent = gdk_event_new (GDK_FOCUS_CHANGE);
+
+ fevent->focus_change.type = GDK_FOCUS_CHANGE;
+ fevent->focus_change.window = widget->window;
+ if (widget->window)
+ g_object_ref (widget->window);
+ fevent->focus_change.in = in;
+ gdk_event_set_device (fevent, dev);
+
+ gtk_widget_send_focus_change (widget, fevent);
+
+ gdk_event_free (fevent);
+ }
}
+static void
+gtk_window_queue_draw_border (GtkWidget *widget)
+{
+ if (is_client_side_decorated (GTK_WINDOW (widget)))
+ {
+ gint border_width = 0;
+ gint lower_padding = 0;
+ gint upper_padding = 0;
+ gint title_height = 0;
+
+ gtk_widget_style_get (widget,
+ "decoration-border-width", &border_width,
+ "decoration-titlebar-upper-padding", &upper_padding,
+ "decoration-titlebar-lower-padding", &lower_padding,
+ NULL);
+
+ title_height = get_title_height (GTK_WINDOW (widget)) + border_width + lower_padding + upper_padding;
+
+ /* Top */
+ gtk_widget_queue_draw_area (widget,
+ 0,
+ 0,
+ widget->allocation.width,
+ title_height);
+
+ /* Left */
+ gtk_widget_queue_draw_area (widget,
+ 0, 0,
+ border_width,
+ widget->allocation.height);
+
+ /* Bottom */
+ gtk_widget_queue_draw_area (widget,
+ 0,
+ widget->allocation.height - border_width,
+ widget->allocation.width,
+ border_width);
+
+ /* Right */
+ gtk_widget_queue_draw_area (widget,
+ widget->allocation.width - border_width,
+ 0,
+ border_width,
+ widget->allocation.height);
+ }
+}
+
static gint
gtk_window_focus_in_event (GtkWidget *widget,
GdkEventFocus *event)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
