[gtk+/xi2: 315/324] Merge branch 'master' into xi2



commit daa6792b43ef3c24f2c0bec820218c4a6f6e6442
Merge: 519f3ea f54910c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue May 18 16:22:04 2010 +0200

    Merge branch 'master' into xi2
    
    Conflicts:
    	configure.ac
    	docs/reference/gdk/tmpl/input_devices.sgml
    	gdk/gdk.symbols
    	gdk/gdkdnd.h
    	gdk/gdkwindow.c
    	gdk/gdkwindow.h
    	gdk/quartz/gdkevents-quartz.c
    	gdk/win32/gdkdnd-win32.c
    	gdk/x11/gdkdnd-x11.c
    	gdk/x11/gdkevents-x11.c
    	gtk/gtkaboutdialog.c
    	gtk/gtkwidget.h
    	gdk/x11/gdkdisplay-x11.c

 Makefile.am                                        |   81 +-
 NEWS                                               |   42 +-
 autogen.sh                                         |   10 +-
 build/win32/vs9/gtk+.vsprops                       |    2 +-
 configure.in => configure.ac                       |  249 +-
 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 +
 docs/RELEASE-HOWTO                                 |    6 +-
 docs/faq/gtk-faq.sgml                              |   56 +-
 docs/gtk-config.txt                                |    4 +-
 docs/refcounting.txt                               |    2 +-
 docs/reference/gdk-pixbuf/Makefile.am              |   10 +-
 ...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 +-
 .../gdk/{gdk-overrides.txt => gdk3-overrides.txt}  |    0
 .../gdk/{gdk-sections.txt => gdk3-sections.txt}    |   45 -
 docs/reference/gdk/{gdk.types => gdk3.types}       |    0
 docs/reference/gdk/tmpl/.gitignore                 |    1 +
 docs/reference/gdk/tmpl/cairo_interaction.sgml     |    3 +
 docs/reference/gdk/tmpl/colors.sgml                |    9 +-
 docs/reference/gdk/tmpl/cursors.sgml               |   10 +-
 docs/reference/gdk/tmpl/dnd.sgml                   |   18 +-
 docs/reference/gdk/tmpl/drawing.sgml               |    3 +
 docs/reference/gdk/tmpl/event_structs.sgml         |    5 +-
 docs/reference/gdk/tmpl/events.sgml                |   15 +-
 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            |    4 +
 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               |   39 +-
 docs/reference/gdk/tmpl/images.sgml                |   55 +-
 docs/reference/gdk/tmpl/input.sgml                 |   13 +-
 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               |   35 +-
 docs/reference/gdk/tmpl/properties.sgml            |    5 +-
 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               |   25 +-
 docs/reference/gdk/tmpl/windows.sgml               | 1852 -----
 docs/reference/gdk/tmpl/x_interaction.sgml         |   16 +-
 docs/reference/gtk/Makefile.am                     |   48 +-
 docs/reference/gtk/glossary.xml                    |    2 +-
 ...der-convert.xml => gtk-builder-convert-3.0.xml} |    8 +-
 docs/reference/gtk/gtk-docs.sgml                   |   33 +-
 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}    | 1018 +---
 docs/reference/gtk/{gtk.types => gtk3.types}       |   19 -
 docs/reference/gtk/objects_grouped.sgml            |    2 -
 docs/reference/gtk/question_index.sgml             |    2 +-
 docs/reference/gtk/running.sgml                    |   93 +-
 docs/reference/gtk/tmpl/.gitignore                 |   16 +
 docs/reference/gtk/tmpl/gtk-unused.sgml            | 4763 ++++++++++++-
 docs/reference/gtk/tmpl/gtkaccelmap.sgml           |    4 +
 docs/reference/gtk/tmpl/gtkactiongroup.sgml        |    3 +
 docs/reference/gtk/tmpl/gtkadjustment.sgml         |    3 +
 docs/reference/gtk/tmpl/gtkbindings.sgml           |   29 +-
 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           |    5 +
 docs/reference/gtk/tmpl/gtkcomboboxentry.sgml      |    5 +
 docs/reference/gtk/tmpl/gtkcontainer.sgml          |  208 +-
 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/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              |   38 +-
 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               |  206 +-
 docs/reference/gtk/tmpl/gtkmenu.sgml               |   37 +-
 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/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              |   27 +-
 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        |   10 +-
 docs/reference/gtk/tmpl/gtkradiomenuitem.sgml      |   10 +-
 docs/reference/gtk/tmpl/gtkradiotoolbutton.sgml    |    3 +
 docs/reference/gtk/tmpl/gtkrange.sgml              |    3 +
 docs/reference/gtk/tmpl/gtkrc.sgml                 |  137 +-
 docs/reference/gtk/tmpl/gtkrecentaction.sgml       |   81 -
 docs/reference/gtk/tmpl/gtkrecentchooser.sgml      |   21 +-
 .../reference/gtk/tmpl/gtkrecentchooserdialog.sgml |    3 +
 docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml  |    4 +
 .../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              |    3 +
 docs/reference/gtk/tmpl/gtkscale.sgml              |    3 +
 docs/reference/gtk/tmpl/gtkscalebutton.sgml        |  173 -
 docs/reference/gtk/tmpl/gtkscrollbar.sgml          |    3 +
 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/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/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            |  229 +-
 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/gtkwindow.sgml             |   94 +-
 docs/reference/gtk/tmpl/gtkwindowgroup.sgml        |    4 +
 docs/reference/libgail-util/Makefile.am            |    2 +-
 ...ections.txt => gail-libgail-util3-sections.txt} |    0
 .../gail-libgail-util3.types}                      |    0
 docs/styles.txt                                    |   11 -
 docs/tools/shooter.c                               |    5 +-
 docs/tutorial/gtk-tut.sgml                         |   38 +-
 examples/Makefile                                  |    5 -
 examples/buttonbox/buttonbox.c                     |    1 -
 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/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                             |   70 +-
 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-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                                    |   53 +-
 gdk/abicheck.sh                                    |    2 +-
 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/gdkwindow-directfb.c                  |  228 -
 gdk/gdk.c                                          |   25 -
 gdk/gdk.h                                          |    3 -
 gdk/gdk.symbols                                    |   40 -
 gdk/gdkcairo.h                                     |    2 +-
 gdk/gdkcolor.h                                     |    2 +-
 gdk/gdkcursor.h                                    |    5 +-
 gdk/gdkdisplay.h                                   |    2 +-
 gdk/gdkdisplaymanager.h                            |    2 +-
 gdk/gdkdnd.h                                       |    7 +-
 gdk/gdkdrawable.h                                  |    2 +-
 gdk/gdkevents.c                                    |    2 +-
 gdk/gdkevents.h                                    |   37 +-
 gdk/gdkgc.c                                        |   53 -
 gdk/gdkgc.h                                        |   14 +-
 gdk/gdki18n.h                                      |   59 -
 gdk/gdkimage.c                                     |   65 -
 gdk/gdkimage.h                                     |   24 +-
 gdk/gdkinput.h                                     |    2 +-
 gdk/gdkkeys.h                                      |    2 +-
 gdk/gdkpango.c                                     |   18 -
 gdk/gdkpango.h                                     |    6 +-
 gdk/gdkpixbuf-render.c                             |   91 -
 gdk/gdkpixbuf.h                                    |   29 +-
 gdk/gdkpixmap.h                                    |    8 +-
 gdk/gdkproperty.h                                  |    2 +-
 gdk/gdkregion.h                                    |    2 +-
 gdk/gdkrgb.c                                       |   45 -
 gdk/gdkrgb.h                                       |   13 +-
 gdk/gdkscreen.h                                    |    2 +-
 gdk/gdkselection.h                                 |   10 +-
 gdk/gdkspawn.h                                     |    2 +-
 gdk/gdktypes.h                                     |   63 +-
 gdk/gdkvisual.h                                    |    6 +-
 gdk/gdkwindow.c                                    |  105 +-
 gdk/gdkwindow.h                                    |  335 +-
 gdk/makefile.msc                                   |    1 -
 gdk/quartz/GdkQuartzView.c                         |   38 +-
 gdk/quartz/gdkdnd-quartz.c                         |   12 -
 gdk/quartz/gdkim-quartz.c                          |    1 -
 gdk/quartz/gdkimage-quartz.c                       |   10 -
 gdk/quartz/gdkwindow-quartz.c                      |   21 +-
 gdk/testgdk.c                                      |   52 +-
 gdk/win32/gdkdnd-win32.c                           |   20 +-
 gdk/win32/gdkevents-win32.c                        |   24 -
 gdk/win32/gdkim-win32.c                            |    1 -
 gdk/win32/gdkimage-win32.c                         |   35 -
 gdk/win32/gdkwin32.h                               |    2 -
 gdk/win32/gdkwindow-win32.c                        |   46 -
 gdk/x11/Makefile.am                                |    2 +-
 gdk/x11/gdkdisplay-x11.c                           |   45 -
 gdk/x11/gdkdnd-x11.c                               |   38 +-
 gdk/x11/gdkimage-x11.c                             |   56 -
 gdk/x11/gdkwindow-x11.c                            |   72 +-
 ...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                                    |  180 +-
 gtk/abicheck.sh                                    |    2 +-
 ...gtk-builder-convert => gtk-builder-convert-3.0} |    6 +-
 gtk/gtk.h                                          |   25 -
 gtk/gtk.symbols                                    |  855 +---
 gtk/gtkaboutdialog.c                               |  217 +-
 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                                    |  136 +-
 gtk/gtkaction.h                                    |   14 +-
 gtk/gtkactiongroup.c                               |    2 +-
 gtk/gtkactiongroup.h                               |    2 +-
 gtk/gtkactivatable.h                               |    2 +-
 gtk/gtkadjustment.h                                |    2 +-
 gtk/gtkalignment.h                                 |    2 +-
 gtk/gtkarrow.h                                     |    2 +-
 gtk/gtkaspectframe.h                               |    2 +-
 gtk/gtkassistant.h                                 |    2 +-
 gtk/gtkbbox.c                                      |  102 -
 gtk/gtkbbox.h                                      |   39 +-
 gtk/gtkbin.h                                       |    2 +-
 gtk/gtkbindings.c                                  |   47 -
 gtk/gtkbindings.h                                  |   10 +-
 gtk/gtkbox.c                                       |   44 -
 gtk/gtkbox.h                                       |    9 +-
 gtk/gtkbuildable.h                                 |    2 +-
 gtk/gtkbuilder.h                                   |    2 +-
 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.h                         |    2 +-
 gtk/gtkcellrenderercombo.h                         |    2 +-
 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.h                                 |    2 +-
 gtk/gtkclist.c                                     | 7806 --------------------
 gtk/gtkclist.h                                     |  792 --
 gtk/gtkcolorbutton.h                               |    2 +-
 gtk/gtkcolorsel.c                                  |   79 -
 gtk/gtkcolorsel.h                                  |   18 +-
 gtk/gtkcolorseldialog.h                            |    2 +-
 gtk/gtkcombo.c                                     | 1234 ----
 gtk/gtkcombo.h                                     |  118 -
 gtk/gtkcombobox.h                                  |    2 +-
 gtk/gtkcomboboxentry.h                             |    2 +-
 gtk/gtkcontainer.c                                 |   49 -
 gtk/gtkcontainer.h                                 |   16 +-
 gtk/gtkctree.c                                     | 6144 ---------------
 gtk/gtkctree.h                                     |  445 --
 gtk/gtkcurve.c                                     | 1039 ---
 gtk/gtkcurve.h                                     |  106 -
 gtk/gtkdebug.h                                     |    4 +-
 gtk/gtkdialog.h                                    |    2 +-
 gtk/gtkdnd-quartz.c                                |   10 -
 gtk/gtkdnd.c                                       |   47 -
 gtk/gtkdnd.h                                       |   10 +-
 gtk/gtkdrawingarea.c                               |   13 -
 gtk/gtkdrawingarea.h                               |    9 +-
 gtk/gtkeditable.c                                  |    2 +-
 gtk/gtkeditable.h                                  |    2 +-
 gtk/gtkentry.c                                     |  186 +-
 gtk/gtkentry.h                                     |   25 +-
 gtk/gtkentrybuffer.h                               |    2 +-
 gtk/gtkentrycompletion.h                           |    2 +-
 gtk/gtkenums.h                                     |   57 +-
 gtk/gtkeventbox.h                                  |    2 +-
 gtk/gtkexpander.h                                  |    2 +-
 gtk/gtkextendedlayout.c                            |   20 +-
 gtk/gtkfilechooser.c                               |   10 +-
 gtk/gtkfilechooser.h                               |    2 +-
 gtk/gtkfilechooserbutton.c                         |   32 -
 gtk/gtkfilechooserbutton.h                         |    9 +-
 gtk/gtkfilechooserdefault.c                        |    4 -
 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/gtkfixed.c                                     |   48 -
 gtk/gtkfixed.h                                     |    8 +-
 gtk/gtkfontbutton.h                                |    2 +-
 gtk/gtkfontsel.c                                   |   57 -
 gtk/gtkfontsel.h                                   |   16 +-
 gtk/gtkframe.h                                     |    2 +-
 gtk/gtkgamma.c                                     |  494 --
 gtk/gtkgamma.h                                     |   82 -
 gtk/gtkgc.h                                        |    2 +-
 gtk/gtkhandlebox.h                                 |    2 +-
 gtk/gtkhbbox.c                                     |   40 -
 gtk/gtkhbbox.h                                     |   10 +-
 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.h                               |    2 +-
 gtk/gtkicontheme.h                                 |    2 +-
 gtk/gtkiconview.h                                  |    2 +-
 gtk/gtkimage.c                                     |   40 -
 gtk/gtkimage.h                                     |   13 +-
 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.h                                 |    2 +-
 gtk/gtkitem.h                                      |    2 +-
 gtk/gtkitemfactory.c                               | 1586 ----
 gtk/gtkitemfactory.h                               |  236 -
 gtk/gtklabel.c                                     |   45 +-
 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                                      |  192 +-
 gtk/gtkmain.h                                      |   51 +-
 gtk/gtkmarshal.list                                |   36 -
 gtk/gtkmenu.c                                      |    2 +-
 gtk/gtkmenu.h                                      |    8 +-
 gtk/gtkmenubar.h                                   |    8 +-
 gtk/gtkmenuitem.c                                  |   18 -
 gtk/gtkmenuitem.h                                  |    7 +-
 gtk/gtkmenushell.h                                 |    2 +-
 gtk/gtkmenutoolbutton.c                            |   33 +-
 gtk/gtkmenutoolbutton.h                            |   10 +-
 gtk/gtkmessagedialog.h                             |    2 +-
 gtk/gtkmisc.h                                      |    2 +-
 gtk/gtkmodules.c                                   |    6 +-
 gtk/gtkmodules.h                                   |    2 +-
 gtk/gtknotebook.c                                  |  278 +-
 gtk/gtknotebook.h                                  |   26 +-
 gtk/gtkobject.c                                    |  684 +--
 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                                     |   11 -
 gtk/gtkpaned.h                                     |   11 +-
 gtk/gtkpapersize.c                                 |    9 +-
 gtk/gtkpapersize.h                                 |    2 +-
 gtk/gtkpixmap.c                                    |  286 -
 gtk/gtkpixmap.h                                    |   83 -
 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/gtkprintjob.h                                  |    2 +-
 gtk/gtkprintoperation.c                            |    2 +-
 gtk/gtkprintoperation.h                            |    2 +-
 gtk/gtkprintoperationpreview.h                     |    2 +-
 gtk/gtkprintsettings.h                             |    2 +-
 gtk/gtkprintunixdialog.h                           |    2 +-
 gtk/gtkprogress.c                                  |    6 +-
 gtk/gtkprogressbar.c                               |  304 +-
 gtk/gtkprogressbar.h                               |   23 +-
 gtk/gtkradioaction.c                               |   16 +-
 gtk/gtkradioaction.h                               |    2 +-
 gtk/gtkradiobutton.h                               |    6 +-
 gtk/gtkradiomenuitem.h                             |    6 +-
 gtk/gtkradiotoolbutton.h                           |    2 +-
 gtk/gtkrange.c                                     |    4 +-
 gtk/gtkrange.h                                     |    2 +-
 gtk/gtkrc.c                                        |  163 +-
 gtk/gtkrc.h                                        |   17 +-
 gtk/gtkrecentaction.c                              |   17 +
 gtk/gtkrecentaction.h                              |    2 +-
 gtk/gtkrecentchooser.c                             |   66 -
 gtk/gtkrecentchooser.h                             |    7 +-
 gtk/gtkrecentchooserdialog.h                       |    2 +-
 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.h                                     |    2 +-
 gtk/gtkscale.c                                     |    7 +-
 gtk/gtkscale.h                                     |    2 +-
 gtk/gtkscalebutton.c                               |   53 +-
 gtk/gtkscalebutton.h                               |   10 +-
 gtk/gtkscrollbar.h                                 |    2 +-
 gtk/gtkscrolledwindow.h                            |    2 +-
 gtk/gtkselection.c                                 |   10 +-
 gtk/gtkselection.h                                 |    6 +-
 gtk/gtkseparator.c                                 |   10 +
 gtk/gtkseparator.h                                 |    2 +-
 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.h                                 |    2 +-
 gtk/gtksocket.c                                    |   26 -
 gtk/gtksocket.h                                    |    7 +-
 gtk/gtkspinbutton.h                                |    7 +-
 gtk/gtkstatusbar.h                                 |    2 +-
 gtk/gtkstatusicon.c                                |   41 +-
 gtk/gtkstatusicon.h                                |    6 +-
 gtk/gtkstock.h                                     |    2 +-
 gtk/gtkstyle.c                                     |  819 +--
 gtk/gtkstyle.h                                     |  212 +-
 gtk/gtktable.h                                     |    2 +-
 gtk/gtktearoffmenuitem.h                           |    2 +-
 gtk/gtktext.c                                      | 5461 --------------
 gtk/gtktext.h                                      |  217 -
 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                                  |   61 +-
 gtk/gtktextview.h                                  |    6 +-
 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                                   |  820 +--
 gtk/gtktoolbar.h                                   |  118 +-
 gtk/gtktoolbutton.c                                |    4 +-
 gtk/gtktoolbutton.h                                |    2 +-
 gtk/gtktoolitem.c                                  |   81 +-
 gtk/gtktoolitem.h                                  |   18 +-
 gtk/gtktooltip.c                                   |  139 +-
 gtk/gtktooltip.h                                   |    2 +-
 gtk/gtktooltips.c                                  |  338 -
 gtk/gtktooltips.h                                  |  109 -
 gtk/gtktrayicon-x11.c                              |   85 +-
 gtk/gtktrayicon.h                                  |    1 +
 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                                 |   25 +
 gtk/gtktreemodel.h                                 |   15 +-
 gtk/gtktreemodelfilter.c                           |   77 +-
 gtk/gtktreemodelfilter.h                           |   13 +-
 gtk/gtktreemodelsort.h                             |    2 +-
 gtk/gtktreeselection.h                             |    2 +-
 gtk/gtktreesortable.h                              |    2 +-
 gtk/gtktreestore.h                                 |    2 +-
 gtk/gtktreeview.c                                  |   79 +-
 gtk/gtktreeview.h                                  |   15 +-
 gtk/gtktreeviewcolumn.c                            |   17 -
 gtk/gtktreeviewcolumn.h                            |    5 +-
 gtk/gtktypeutils.c                                 |  168 -
 gtk/gtktypeutils.h                                 |  167 +-
 gtk/gtkuimanager.h                                 |    2 +-
 gtk/gtkvbbox.c                                     |   63 -
 gtk/gtkvbbox.h                                     |   13 +-
 gtk/gtkvbox.h                                      |    2 +-
 gtk/gtkviewport.h                                  |    2 +-
 gtk/gtkvolumebutton.h                              |    2 +-
 gtk/gtkvpaned.h                                    |    2 +-
 gtk/gtkvruler.h                                    |    2 +-
 gtk/gtkvscale.h                                    |    2 +-
 gtk/gtkvscrollbar.h                                |    2 +-
 gtk/gtkvseparator.h                                |    2 +-
 gtk/gtkwidget.c                                    |  264 +-
 gtk/gtkwidget.h                                    |  375 +-
 gtk/gtkwindow.c                                    |   41 +-
 gtk/gtkwindow.h                                    |   12 +-
 gtk/makefile.msc.in                                |    6 -
 gtk/queryimmodules.c                               |  177 +-
 gtk/tests/Makefile.am                              |   16 +-
 gtk/tests/builder.c                                |    8 +-
 gtk/tests/defaultvalue.c                           |   17 -
 {tests => gtk/tests}/file-chooser-test-dir/empty   |    0
 .../tests}/file-chooser-test-dir/text.txt          |    0
 gtk/tests/floating.c                               |   15 +-
 gtk/tests/object.c                                 |    1 -
 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/input/Makefile.am                          |   22 +-
 modules/other/gail/Makefile.am                     |   18 +-
 modules/other/gail/gail.c                          |   21 +-
 modules/other/gail/gail.h                          |    6 -
 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                     |    4 +-
 modules/other/gail/gailitem.c                      |    7 -
 modules/other/gail/gaillabel.c                     |   20 +-
 modules/other/gail/gaillist.c                      |  242 -
 modules/other/gail/gaillist.h                      |   51 -
 modules/other/gail/gailmenu.c                      |    2 +-
 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/gailtoplevel.c                  |    3 -
 modules/other/gail/gailwidget.c                    |   34 +-
 modules/other/gail/gailwindow.c                    |    2 +-
 modules/other/gail/libgail-util/Makefile.am        |   18 +-
 modules/other/gail/tests/Makefile.am               |   15 +-
 modules/other/gail/tests/README                    |    8 -
 modules/other/gail/tests/ferret.c                  |    5 +-
 modules/other/gail/tests/testcombo.c               |   10 +-
 modules/other/gail/tests/testoptionmenu.c          |  157 -
 modules/printbackends/cups/Makefile.am             |    2 +-
 modules/printbackends/file/Makefile.am             |    2 +-
 modules/printbackends/lpr/Makefile.am              |    4 +-
 modules/printbackends/test/Makefile.am             |    2 +-
 perf/Makefile.am                                   |    2 +-
 po-properties/POTFILES.in                          |   19 -
 po-properties/af.po                                | 1932 +++---
 po-properties/am.po                                | 1758 ++---
 po-properties/ang.po                               | 1732 ++---
 po-properties/ar.po                                | 1917 +++---
 po-properties/as.po                                | 1931 +++---
 po-properties/ast.po                               | 1944 +++---
 po-properties/az.po                                | 1927 +++---
 po-properties/az_IR.po                             | 1732 ++---
 po-properties/be.po                                | 1934 +++---
 po-properties/be latin po                          | 1945 +++---
 po-properties/bg.po                                | 1934 +++---
 po-properties/bn.po                                | 3974 +++++-----
 po-properties/bn_IN.po                             | 4146 ++++++-----
 po-properties/br.po                                | 1751 ++---
 po-properties/bs.po                                | 1934 +++---
 po-properties/ca.po                                | 3912 +++++-----
 po-properties/ca valencia po                       | 3912 +++++-----
 po-properties/crh.po                               | 2061 +++---
 po-properties/cs.po                                | 1925 +++---
 po-properties/cy.po                                | 1942 +++---
 po-properties/da.po                                | 1929 +++---
 po-properties/de.po                                | 1932 +++---
 po-properties/dz.po                                | 1922 +++---
 po-properties/el.po                                | 1933 +++---
 po-properties/en shaw po                           | 3704 +++++++---
 po-properties/en_CA.po                             | 1927 +++---
 po-properties/en_GB.po                             | 1928 +++---
 po-properties/eo.po                                | 1732 ++---
 po-properties/es.po                                | 3917 +++++-----
 po-properties/et.po                                | 1849 +++---
 po-properties/eu.po                                | 2279 +++---
 po-properties/fa.po                                | 1812 +++---
 po-properties/fi.po                                | 1924 +++---
 po-properties/fr.po                                | 1953 +++---
 po-properties/ga.po                                | 1760 ++---
 po-properties/gl.po                                | 1179 ++--
 po-properties/gu.po                                | 1923 +++---
 po-properties/he.po                                | 1928 +++---
 po-properties/hi.po                                | 1917 +++---
 po-properties/hr.po                                | 1926 +++---
 po-properties/hu.po                                | 1930 +++---
 po-properties/hy.po                                | 1740 ++---
 po-properties/ia.po                                | 1744 ++---
 po-properties/id.po                                | 6731 ++++++++----------
 po-properties/io.po                                | 1732 ++---
 po-properties/is.po                                | 1744 ++---
 po-properties/it.po                                | 1951 +++---
 po-properties/ja.po                                | 1917 +++---
 po-properties/ka.po                                | 1918 +++---
 po-properties/kk.po                                | 3870 +++++------
 po-properties/kn.po                                | 4106 ++++++-----
 po-properties/ko.po                                | 1923 +++---
 po-properties/ku.po                                | 1744 ++---
 po-properties/li.po                                | 1927 +++---
 po-properties/lt.po                                | 1927 +++---
 po-properties/lv.po                                | 1916 +++---
 po-properties/mai.po                               | 1917 +++---
 po-properties/mi.po                                | 1735 ++---
 po-properties/mk.po                                | 1927 +++---
 po-properties/ml.po                                | 1918 +++---
 po-properties/mn.po                                | 2013 +++---
 po-properties/mr.po                                | 4100 ++++++-----
 po-properties/ms.po                                | 1931 +++---
 po-properties/my.po                                | 1925 +++---
 po-properties/nb.po                                | 1926 +++---
 po-properties/nds.po                               | 2009 +++---
 po-properties/ne.po                                | 1914 +++---
 po-properties/nl.po                                | 1940 +++---
 po-properties/nn.po                                | 1942 +++---
 po-properties/nso.po                               | 1953 +++---
 po-properties/oc.po                                | 1739 ++---
 po-properties/or.po                                | 3960 +++++------
 po-properties/pa.po                                | 1920 +++---
 po-properties/pl.po                                | 1945 +++---
 po-properties/ps.po                                | 1788 +++---
 po-properties/pt.po                                | 1935 +++---
 po-properties/pt_BR.po                             | 1928 +++---
 po-properties/ro.po                                | 1943 +++---
 po-properties/ru.po                                | 1936 +++---
 po-properties/rw.po                                | 1952 +++---
 po-properties/si.po                                | 1749 ++---
 po-properties/sk.po                                | 1922 +++---
 po-properties/sl.po                                | 1930 +++---
 po-properties/sq.po                                | 1959 +++---
 po-properties/sr.po                                | 1933 +++---
 po-properties/sr ije po                            | 1934 +++---
 po-properties/sr latin po                          | 1933 +++---
 po-properties/sv.po                                | 1928 +++---
 po-properties/ta.po                                | 1926 +++---
 po-properties/te.po                                | 1917 +++---
 po-properties/th.po                                | 1733 ++---
 po-properties/tk.po                                | 1740 ++---
 po-properties/tr.po                                | 2021 +++---
 po-properties/tt.po                                | 1756 ++---
 po-properties/uk.po                                | 3909 +++++-----
 po-properties/ur.po                                | 1739 ++---
 po-properties/uz.po                                | 1757 ++---
 po-properties/uz cyrillic po                       | 1757 ++---
 po-properties/vi.po                                | 1935 +++---
 po-properties/wa.po                                | 1809 +++---
 po-properties/xh.po                                | 1946 +++---
 po-properties/yi.po                                | 1925 +++---
 po-properties/zh_CN.po                             | 1917 +++---
 po-properties/zh_HK.po                             | 1917 +++---
 po-properties/zh_TW.po                             | 1917 +++---
 po/POTFILES.in                                     |   19 -
 po/af.po                                           |  620 +-
 po/am.po                                           |  545 +-
 po/ang.po                                          |  513 +-
 po/ar.po                                           |  618 +-
 po/as.po                                           |  616 +-
 po/ast.po                                          |  624 +-
 po/az.po                                           |  637 +-
 po/az_IR.po                                        |  451 +-
 po/be.po                                           |  637 +-
 po/be latin po                                     |  618 +-
 po/bg.po                                           |  622 +-
 po/bn.po                                           | 2553 ++++----
 po/bn_IN.po                                        | 2565 ++++----
 po/br.po                                           |  569 +-
 po/bs.po                                           |  642 +-
 po/ca.po                                           |  623 +-
 po/ca valencia po                                  | 2522 +++----
 po/crh.po                                          |  714 +-
 po/cs.po                                           |  622 +-
 po/cy.po                                           |  623 +-
 po/da.po                                           | 2517 +++----
 po/de.po                                           |  622 +-
 po/dz.po                                           |  616 +-
 po/el.po                                           | 2517 +++----
 po/en shaw po                                      | 5052 ++++++++------
 po/en_CA.po                                        |  619 +-
 po/en_GB.po                                        |  619 +-
 po/eo.po                                           |  618 +-
 po/es.po                                           | 2545 ++++----
 po/et.po                                           |  616 +-
 po/eu.po                                           |  662 +-
 po/fa.po                                           |  634 +-
 po/fi.po                                           |  620 +-
 po/fr.po                                           |  624 +-
 po/ga.po                                           |  612 +-
 po/gl.po                                           |  547 +-
 po/gu.po                                           |  616 +-
 po/he.po                                           |  626 +-
 po/hi.po                                           |  618 +-
 po/hr.po                                           |  629 +-
 po/hu.po                                           |  620 +-
 po/hy.po                                           |  643 +-
 po/ia.po                                           |  607 +-
 po/id.po                                           | 2860 ++++----
 po/io.po                                           |  575 +-
 po/is.po                                           |  630 +-
 po/it.po                                           | 2250 +++---
 po/ja.po                                           |  618 +-
 po/ka.po                                           |  616 +-
 po/kk.po                                           | 2454 +++----
 po/kn.po                                           | 2544 ++++----
 po/ko.po                                           |  620 +-
 po/ku.po                                           |  617 +-
 po/li.po                                           |  652 +-
 po/lt.po                                           |  619 +-
 po/lv.po                                           | 2556 ++++----
 po/mai.po                                          |  614 +-
 po/mi.po                                           |  584 +-
 po/mk.po                                           |  623 +-
 po/ml.po                                           |  620 +-
 po/mn.po                                           |  730 +-
 po/mr.po                                           | 2571 ++++----
 po/ms.po                                           |  641 +-
 po/my.po                                           |  615 +-
 po/nb.po                                           | 2512 +++----
 po/nds.po                                          |  600 +-
 po/ne.po                                           |  639 +-
 po/nl.po                                           |  650 +-
 po/nn.po                                           |  637 +-
 po/nso.po                                          |  646 +-
 po/oc.po                                           |  548 +-
 po/or.po                                           |  616 +-
 po/pa.po                                           |  614 +-
 po/pl.po                                           |  622 +-
 po/ps.po                                           |  578 +-
 po/pt.po                                           |  624 +-
 po/pt_BR.po                                        |  624 +-
 po/ro.po                                           |  621 +-
 po/ru.po                                           |  616 +-
 po/rw.po                                           |  674 +-
 po/si.po                                           |  613 +-
 po/sk.po                                           |  616 +-
 po/sl.po                                           |  618 +-
 po/sq.po                                           |  627 +-
 po/sr.po                                           |  620 +-
 po/sr ije po                                       |  642 +-
 po/sr latin po                                     |  620 +-
 po/sv.po                                           |  623 +-
 po/ta.po                                           |  614 +-
 po/te.po                                           |  618 +-
 po/th.po                                           |  614 +-
 po/tk.po                                           |  546 +-
 po/tr.po                                           |  709 +-
 po/tt.po                                           |  572 +-
 po/uk.po                                           | 2522 +++----
 po/ur.po                                           |  454 +-
 po/uz.po                                           |  557 +-
 po/uz cyrillic po                                  |  557 +-
 po/vi.po                                           |  617 +-
 po/wa.po                                           |  624 +-
 po/xh.po                                           |  644 +-
 po/yi.po                                           |  645 +-
 po/zh_CN.po                                        |  612 +-
 po/zh_HK.po                                        |  612 +-
 po/zh_TW.po                                        |  612 +-
 sanity_check                                       |    4 +-
 tests/Makefile.am                                  |   26 +-
 tests/prop-editor.c                                |    1 +
 tests/stresstest-toolbar.c                         |    7 +-
 tests/testgtk.c                                    | 3886 +---------
 tests/testgtkrc                                    |    1 -
 tests/testinput.c                                  |   41 -
 tests/testmenus.c                                  |  246 -
 tests/testoffscreen.c                              |   22 +-
 tests/testselection.c                              |   37 +-
 tests/testsocket.c                                 |   62 +-
 tests/testsocket_common.c                          |   90 +-
 tests/testtext.c                                   |    2 +-
 tests/testtoolbar.c                                |   53 +-
 tests/testtreeview.c                               |   79 +-
 943 files changed, 166048 insertions(+), 241341 deletions(-)
---
diff --cc configure.ac
index 3f9714d,d8a20eb..f0f26b8
--- a/configure.ac
+++ b/configure.ac
@@@ -1569,9 -1558,10 +1558,9 @@@ if test "x$gdktarget" = "xx11"; the
        esac
      fi
    fi
-   
+ 
    # set up things for XInput
 -
 -  if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
 +  if test "x$with_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
      AC_DEFINE(XINPUT_XFREE, 1,
                [Define to 1 if XFree XInput should be used])
  
diff --cc docs/reference/gtk/gtk3-sections.txt
index 98279ba,bdf2fb4..c38cfbe
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@@ -2451,12 -1955,8 +1956,9 @@@ gtk_link_button_get_typ
  GtkMenu
  gtk_menu_new
  gtk_menu_set_screen
- gtk_menu_append
- gtk_menu_prepend
- gtk_menu_insert
  gtk_menu_reorder_child
  gtk_menu_attach
 +gtk_menu_popup_for_device
  gtk_menu_popup
  gtk_menu_set_accel_group
  gtk_menu_get_accel_group
@@@ -5587,14 -4770,9 +4772,11 @@@ GtkSelectionDat
  GtkWidgetAuxInfo
  GtkWidgetShapeInfo
  GtkWidgetHelpType
 +GtkMultiDeviceEvent
 +GtkMultiDeviceEventType
  gtk_widget_new
- gtk_widget_ref
- gtk_widget_unref
  gtk_widget_destroy
  gtk_widget_destroyed
- gtk_widget_set
  gtk_widget_unparent
  gtk_widget_show
  gtk_widget_show_now
diff --cc gdk/gdk.symbols
index ba9c33d,ae47401..168f142
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@@ -56,19 -58,6 +56,18 @@@ gdk_setting_ge
  #endif
  #endif
  
 +#if IN_HEADER(__GDK_EVENTS_H__)
 +#if IN_FILE(__GDK_DISPLAY_X11_C__)
 +gdk_add_client_message_filter
- gdk_event_get_graphics_expose
 +#endif
 +#endif
 +
 +#if IN_HEADER(__GDK_EVENTS_H__)
 +#if IN_FILE(__GDK_EVENT_SOURCE_C__)
 +gdk_events_pending
 +#endif
 +#endif
 +
  #if IN_HEADER(__GDK_H__)
  #if IN_FILE(__GDK_MAIN_X11_C__)
  gdk_error_trap_pop
@@@ -147,10 -132,6 +146,7 @@@ gdk_get_display_arg_nam
  gdk_get_program_class
  gdk_init
  gdk_init_check
 +gdk_enable_multidevice
- #ifndef GDK_DISABLE_DEPRECATED
- gdk_exit
- #endif
  gdk_pre_parse_libgtk_only
  gdk_parse_args
  gdk_set_program_class
@@@ -543,12 -505,6 +539,8 @@@ gdk_drag_abor
  gdk_drag_begin
  gdk_drag_context_get_type G_GNUC_CONST
  gdk_drag_context_new
 +gdk_drag_context_get_device
 +gdk_drag_context_set_device
- #ifndef GDK_DISABLE_DEPRECATED
- gdk_drag_context_ref
- gdk_drag_context_unref
- #endif
  gdk_drag_drop
  gdk_drag_drop_succeeded
  gdk_drag_find_window_for_screen
diff --cc gdk/gdkdnd.h
index 3c63a6e,996c076..b125882
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@@ -108,16 -107,6 +108,11 @@@ struct _GdkDragContextClass 
  GType            gdk_drag_context_get_type   (void) G_GNUC_CONST;
  GdkDragContext * gdk_drag_context_new        (void);
  
- #ifndef GDK_DISABLE_DEPRECATED
- void             gdk_drag_context_ref        (GdkDragContext *context);
- void             gdk_drag_context_unref      (GdkDragContext *context);
- #endif
- 
 +void             gdk_drag_context_set_device (GdkDragContext *context,
 +                                              GdkDevice      *device);
 +GdkDevice *      gdk_drag_context_get_device (GdkDragContext *context);
 +
 +
  /* Destination side */
  
  void             gdk_drag_status        (GdkDragContext   *context,
diff --cc gdk/gdkwindow.c
index 43f7e74,2b982ff..a8b07ca
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@@ -26,16 -26,23 +26,25 @@@
   */
  
  #include "config.h"
+ 
  #include "gdkwindow.h"
- #include "gdkwindowimpl.h"
+ 
+ #ifdef GDK_WINDOWING_X11
+ #include "x11/gdkx.h"           /* For workaround */
+ #endif
+ #include "math.h"
+ 
+ #include "gdk.h"                /* For gdk_rectangle_union() */
  #include "gdkinternals.h"
- #include "gdk.h"		/* For gdk_rectangle_union() */
- #include "gdkpixmap.h"
- #include "gdkdrawable.h"
  #include "gdkintl.h"
 +#include "gdkscreen.h"
 +#include "gdkdeviceprivate.h"
+ #include "gdkdrawable.h"
  #include "gdkmarshalers.h"
+ #include "gdkpixmap.h"
+ #include "gdkscreen.h"
+ #include "gdkwindowimpl.h"
+ 
  #include "gdkalias.h"
  
  #undef DEBUG_WINDOW_PRINTING
diff --cc gdk/gdkwindow.h
index 7286cf7,3f6bb5b..a6eb835
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@@ -721,25 -918,7 +940,11 @@@ void       gdk_window_redirect_to_drawa
                                                gint           height);
  void       gdk_window_remove_redirection     (GdkWindow     *window);
  
 +/* Multidevice support */
 +void       gdk_window_set_support_multidevice (GdkWindow *window,
 +                                               gboolean   support_multidevice);
 +gboolean   gdk_window_get_support_multidevice (GdkWindow *window);
  
- #ifndef GDK_DISABLE_DEPRECATED
- #define GDK_ROOT_PARENT()             (gdk_get_default_root_window ())
- #define gdk_window_get_size            gdk_drawable_get_size
- #define gdk_window_get_type            gdk_window_get_window_type
- #define gdk_window_get_colormap        gdk_drawable_get_colormap
- #define gdk_window_set_colormap        gdk_drawable_set_colormap
- #define gdk_window_get_visual          gdk_drawable_get_visual
- #define gdk_window_ref                 g_object_ref
- #define gdk_window_unref               g_object_unref
- 
- #define gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) \
-    gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
- #endif /* GDK_DISABLE_DEPRECATED */
- 
  G_END_DECLS
  
  #endif /* __GDK_WINDOW_H__ */
diff --cc gdk/win32/gdkdnd-win32.c
index 7ee5781,f0b57a9..6436fb7
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@@ -204,55 -203,6 +204,39 @@@ gdk_drag_context_new (void
    return g_object_new (GDK_TYPE_DRAG_CONTEXT, NULL);
  }
  
- void
- gdk_drag_context_ref (GdkDragContext *context)
- {
-   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
- 
-   g_object_ref (context);
- }
- 
- void
- gdk_drag_context_unref (GdkDragContext *context)
- {
-   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
- 
-   g_object_unref (context);
- }
- 
 +GdkDevice *
 +gdk_drag_context_get_device (GdkDragContext *context)
 +{
 +  GdkDragContextPrivateWin32 *private;
 +
 +  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
 +
 +  private = PRIVATE_DATA (context);
 +
 +  return private->device;
 +}
 +
 +void
 +gdk_drag_context_set_device (GdkDragContext *context,
 +                             GdkDevice      *device)
 +{
 +  GdkDragContextPrivateWin32 *private;
 +
 +  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
 +  g_return_if_fail (GDK_IS_DEVICE (device));
 +
 +  private = PRIVATE_DATA (context);
 +
 +  if (private->device)
 +    {
 +      g_object_unref (private->device);
 +      private->device = NULL;
 +    }
 +
 +  if (device)
 +    private->device = g_object_ref (device);
 +}
 +
  static GdkDragContext *
  gdk_drag_context_find (gboolean   is_source,
  		       GdkWindow *source,
diff --cc gdk/x11/gdkdisplay-x11.c
index aefe5d1,c0cbc99..9066d20
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@@ -2481,228 -1475,6 +2481,183 @@@ gdk_display_supports_composite (GdkDisp
  	 x11_display->have_xfixes;
  }
  
 +/**
 + * gdk_display_list_devices:
 + * @display: a #GdkDisplay
 + *
 + * Returns the list of available input devices attached to @display.
 + * The list is statically allocated and should not be freed.
 + *
 + * Return value: a list of #GdkDevice
 + *
 + * Since: 2.2
 + **/
 +GList *
 +gdk_display_list_devices (GdkDisplay *display)
 +{
 +  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 +
 +  return GDK_DISPLAY_X11 (display)->input_devices;
 +}
 +
 +/**
 + * gdk_event_send_client_message_for_display:
 + * @display: the #GdkDisplay for the window where the message is to be sent.
 + * @event: the #GdkEvent to send, which should be a #GdkEventClient.
 + * @winid: the window to send the client message to.
 + *
 + * On X11, sends an X ClientMessage event to a given window. On
 + * Windows, sends a message registered with the name
 + * GDK_WIN32_CLIENT_MESSAGE.
 + *
 + * This could be used for communicating between different
 + * applications, though the amount of data is limited to 20 bytes on
 + * X11, and to just four bytes on Windows.
 + *
 + * Returns: non-zero on success.
 + *
 + * Since: 2.2
 + */
 +gboolean
 +gdk_event_send_client_message_for_display (GdkDisplay     *display,
 +					   GdkEvent       *event,
 +					   GdkNativeWindow winid)
 +{
 +  XEvent sev;
 +
 +  g_return_val_if_fail(event != NULL, FALSE);
 +
 +  /* Set up our event to send, with the exception of its target window */
 +  sev.xclient.type = ClientMessage;
 +  sev.xclient.display = GDK_DISPLAY_XDISPLAY (display);
 +  sev.xclient.format = event->client.data_format;
 +  sev.xclient.window = winid;
 +  memcpy(&sev.xclient.data, &event->client.data, sizeof (sev.xclient.data));
 +  sev.xclient.message_type = gdk_x11_atom_to_xatom_for_display (display, event->client.message_type);
 +
 +  return _gdk_send_xevent (display, winid, False, NoEventMask, &sev);
 +}
 +
 +/**
 + * gdk_display_add_client_message_filter:
 + * @display: a #GdkDisplay for which this message filter applies
 + * @message_type: the type of ClientMessage events to receive.
 + *   This will be checked against the @message_type field
 + *   of the XClientMessage event struct.
 + * @func: the function to call to process the event.
 + * @data: user data to pass to @func.
 + *
 + * Adds a filter to be called when X ClientMessage events are received.
 + * See gdk_window_add_filter() if you are interested in filtering other
 + * types of events.
 + *
 + * Since: 2.2
 + **/
 +void
 +gdk_display_add_client_message_filter (GdkDisplay   *display,
 +				       GdkAtom       message_type,
 +				       GdkFilterFunc func,
 +				       gpointer      data)
 +{
 +  GdkClientFilter *filter;
 +  g_return_if_fail (GDK_IS_DISPLAY (display));
 +  filter = g_new (GdkClientFilter, 1);
 +
 +  filter->type = message_type;
 +  filter->function = func;
 +  filter->data = data;
 +
 +  GDK_DISPLAY_X11(display)->client_filters =
 +    g_list_append (GDK_DISPLAY_X11 (display)->client_filters,
 +		   filter);
 +}
 +
 +/**
 + * gdk_add_client_message_filter:
 + * @message_type: the type of ClientMessage events to receive. This will be
 + *     checked against the <structfield>message_type</structfield> field of the
 + *     XClientMessage event struct.
 + * @func: the function to call to process the event.
 + * @data: user data to pass to @func.
 + *
 + * Adds a filter to the default display to be called when X ClientMessage events
 + * are received. See gdk_display_add_client_message_filter().
 + **/
 +void
 +gdk_add_client_message_filter (GdkAtom       message_type,
 +			       GdkFilterFunc func,
 +			       gpointer      data)
 +{
 +  gdk_display_add_client_message_filter (gdk_display_get_default (),
 +					 message_type, func, data);
 +}
 +
 +/*
 + *--------------------------------------------------------------
 + * gdk_flush
 + *
 + *   Flushes the Xlib output buffer and then waits
 + *   until all requests have been received and processed
 + *   by the X server. The only real use for this function
 + *   is in dealing with XShm.
 + *
 + * Arguments:
 + *
 + * Results:
 + *
 + * Side effects:
 + *
 + *--------------------------------------------------------------
 + */
 +void
 +gdk_flush (void)
 +{
 +  GSList *tmp_list = _gdk_displays;
 +
 +  while (tmp_list)
 +    {
 +      XSync (GDK_DISPLAY_XDISPLAY (tmp_list->data), False);
 +      tmp_list = tmp_list->next;
 +    }
 +}
 +
 +/**
 + * gdk_x11_register_standard_event_type:
 + * @display: a #GdkDisplay
 + * @event_base: first event type code to register
 + * @n_events: number of event type codes to register
 + *
 + * Registers interest in receiving extension events with type codes
 + * between @event_base and <literal>event_base + n_events - 1</literal>.
 + * The registered events must have the window field in the same place
 + * as core X events (this is not the case for e.g. XKB extension events).
 + *
 + * If an event type is registered, events of this type will go through
 + * global and window-specific filters (see gdk_window_add_filter()).
 + * Unregistered events will only go through global filters.
 + * GDK may register the events of some X extensions on its own.
 + *
 + * This function should only be needed in unusual circumstances, e.g.
 + * when filtering XInput extension events on the root window.
 + *
 + * Since: 2.4
 + **/
 +void
 +gdk_x11_register_standard_event_type (GdkDisplay *display,
 +				      gint        event_base,
 +				      gint        n_events)
 +{
 +  GdkEventTypeX11 *event_type;
 +  GdkDisplayX11 *display_x11;
 +
 +  display_x11 = GDK_DISPLAY_X11 (display);
 +  event_type = g_new (GdkEventTypeX11, 1);
 +
 +  event_type->base = event_base;
 +  event_type->n_events = n_events;
 +
 +  display_x11->event_types = g_slist_prepend (display_x11->event_types, event_type);
 +}
  
- static Bool
- graphics_expose_predicate (Display  *display,
- 			   XEvent   *xevent,
- 			   XPointer  arg)
- {
-   if (xevent->xany.window == GDK_DRAWABLE_XID ((GdkDrawable *)arg) &&
-       (xevent->xany.type == GraphicsExpose ||
-        xevent->xany.type == NoExpose))
-     return True;
-   else
-     return False;
- }
- 
- /**
-  * gdk_event_get_graphics_expose:
-  * @window: the #GdkWindow to wait for the events for.
-  *
-  * Waits for a GraphicsExpose or NoExpose event from the X server.
-  * This is used in the #GtkText and #GtkCList widgets in GTK+ to make sure any
-  * GraphicsExpose events are handled before the widget is scrolled.
-  *
-  * Return value:  a #GdkEventExpose if a GraphicsExpose was received, or %NULL if a
-  * NoExpose event was received.
-  *
-  * Deprecated: 2.18
-  **/
- GdkEvent*
- gdk_event_get_graphics_expose (GdkWindow *window)
- {
-   GdkDisplay *display;
-   XEvent xevent;
- 
-   g_return_val_if_fail (window != NULL, NULL);
- 
-   display = gdk_drawable_get_display (GDK_DRAWABLE (window));
- 
-   XIfEvent (GDK_WINDOW_XDISPLAY (window), &xevent,
- 	    graphics_expose_predicate, (XPointer) window);
- 
-   if (xevent.xany.type == GraphicsExpose)
-     return gdk_event_translator_translate (GDK_EVENT_TRANSLATOR (display),
-                                            display, &xevent);
-   return NULL;
- }
- 
  #define __GDK_DISPLAY_X11_C__
  #include "gdkaliasdef.c"
diff --cc gdk/x11/gdkdnd-x11.c
index 558bf43,8f67300..acce83b
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@@ -221,87 -220,6 +221,55 @@@ gdk_drag_context_new (void
    return g_object_new (GDK_TYPE_DRAG_CONTEXT, NULL);
  }
  
 +/**
-  * gdk_drag_context_ref:
-  * @context: a #GdkDragContext.
-  *
-  * Deprecated function; use g_object_ref() instead.
-  *
-  * Deprecated: 2.2: Use g_object_ref() instead.
-  **/
- void            
- gdk_drag_context_ref (GdkDragContext *context)
- {
-   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
- 
-   g_object_ref (context);
- }
- 
- /**
-  * gdk_drag_context_unref:
-  * @context: a #GdkDragContext.
-  *
-  * Deprecated function; use g_object_unref() instead.
-  *
-  * Deprecated: 2.2: Use g_object_unref() instead.
-  **/
- void            
- gdk_drag_context_unref (GdkDragContext *context)
- {
-   g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
- 
-   g_object_unref (context);
- }
- 
- /**
 + * gdk_drag_context_set_device:
 + * @context: a #GdkDragContext
 + * @device: a #GdkDevice
 + *
 + * Associates a #GdkDevice to @context, so all Drag and Drop events
 + * for @context are emitted as if they came from this device.
 + **/
 +void
 +gdk_drag_context_set_device (GdkDragContext *context,
 +                             GdkDevice      *device)
 +{
 +  GdkDragContextPrivateX11 *private;
 +
 +  g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
 +  g_return_if_fail (GDK_IS_DEVICE (device));
 +
 +  private = PRIVATE_DATA (context);
 +
 +  if (private->device)
 +    {
 +      g_object_unref (private->device);
 +      private->device = NULL;
 +    }
 +
 +  if (device)
 +    private->device = g_object_ref (device);
 +}
 +
 +/**
 + * gdk_drag_context_get_device:
 + * @context: a #GdkDragContext
 + *
 + * Returns the #GdkDevice associated to the drag context.
 + *
 + * Returns: The #GdkDevice associated to @context.
 + **/
 +GdkDevice *
 +gdk_drag_context_get_device (GdkDragContext *context)
 +{
 +  GdkDragContextPrivateX11 *private;
 +
 +  g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), NULL);
 +
 +  private = PRIVATE_DATA (context);
 +
 +  return private->device;
 +}
 +
  static GdkDragContext *
  gdk_drag_context_find (GdkDisplay *display,
  		       gboolean    is_source,
diff --cc gtk/gtk.symbols
index ea20b06,c831414..49326b7
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@@ -2404,22 -1951,8 +1951,9 @@@ gtk_list_store_swa
  #if IN_FILE(__GTK_MAIN_C__)
  gtk_get_option_group
  gtk_get_current_event
 +gtk_get_current_event_device
  gtk_get_current_event_state
  gtk_get_current_event_time
- #ifndef GTK_DISABLE_DEPRECATED
- gtk_exit
- gtk_idle_add
- gtk_idle_add_full
- gtk_idle_add_priority
- gtk_idle_remove
- gtk_idle_remove_by_data
- gtk_timeout_add
- gtk_timeout_add_full
- gtk_timeout_remove
- gtk_input_add_full
- gtk_input_remove
- #endif
  gtk_false G_GNUC_CONST
  gtk_true G_GNUC_CONST
  gtk_events_pending
diff --cc gtk/gtkaboutdialog.c
index 86fd04c,54e70d6..6b17f1c
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@@ -1925,12 -1866,11 +1867,12 @@@ text_view_event_after (GtkWidget      *
  
  static void
  set_cursor_if_appropriate (GtkAboutDialog *about,
 -                           GtkTextView    *text_view,
 -                           gint            x,
 -                           gint            y)
 +			   GtkTextView    *text_view,
 +                           GdkDevice      *device,
 +			   gint            x,
 +			   gint            y)
  {
-   GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
+   GtkAboutDialogPrivate *priv = about->priv;
    GSList *tags = NULL, *tagp = NULL;
    GtkTextIter iter;
    gboolean hovering_over_link = FALSE;
diff --cc gtk/gtkwidget.h
index 7ffa394,38b2dca..32d81ec
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@@ -1105,53 -753,6 +797,16 @@@ GtkClipboard *gtk_widget_get_clipboar
  GdkPixmap *   gtk_widget_get_snapshot    (GtkWidget    *widget,
                                            GdkRectangle *clip_rect);
  
 +/* Multidevice support */
 +gboolean         gtk_widget_get_support_multidevice (GtkWidget      *widget);
 +void             gtk_widget_set_support_multidevice (GtkWidget      *widget,
 +                                                     gboolean        support_multidevice);
 +GtkDeviceGroup * gtk_widget_get_group_for_device    (GtkWidget      *widget,
 +                                                     GdkDevice      *device);
 +GtkDeviceGroup * gtk_widget_create_device_group     (GtkWidget      *widget);
 +void             gtk_widget_remove_device_group     (GtkWidget      *widget,
 +                                                     GtkDeviceGroup *group);
 +
- 
- #ifndef GTK_DISABLE_DEPRECATED
- 
- /**
-  * gtk_widget_set_visual:
-  * @widget: a #GtkWidget
-  * @visual: a visual
-  *
-  * This function is deprecated; it does nothing.
-  */
- #define gtk_widget_set_visual(widget,visual)  ((void) 0)
- 
- /**
-  * gtk_widget_push_visual:
-  * @visual: a visual
-  *
-  * This function is deprecated; it does nothing.
-  */
- #define gtk_widget_push_visual(visual)        ((void) 0)
- 
- /**
-  * gtk_widget_pop_visual:
-  *
-  * This function is deprecated; it does nothing.
-  */
- #define gtk_widget_pop_visual()               ((void) 0)
- 
- /**
-  * gtk_widget_set_default_visual:
-  * @visual: a visual
-  *
-  * This function is deprecated; it does nothing.
-  */
- #define gtk_widget_set_default_visual(visual) ((void) 0)
- 
- #endif /* GTK_DISABLE_DEPRECATED */
- 
  /* Accessibility support */
  AtkObject*       gtk_widget_get_accessible               (GtkWidget          *widget);
  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]