Merge branch 'gestures'

Desktop / GNOME / GTK - Carlos Garnacho [gnome.org] - 23 May 2014 12:58 UTC

bd35df0 Merge branch 'gestures'

demos/gtk-demo/Makefile.am | 1 +
demos/gtk-demo/colorsel.c | 2 +-
demos/gtk-demo/demo.gresource.xml | 1 +
demos/gtk-demo/gestures.c | 195 +++++
docs/reference/gtk/gtk-docs.sgml | 14 +
docs/reference/gtk/gtk3-sections.txt | 228 +++++
docs/reference/gtk/gtk3.types.in | 10 +
gdk/gdkevents.c | 18 +-
gdk/gdkevents.h | 4 +
gdk/gdkwindow.c | 1 +
gtk/Makefile.am | 31 +-
gtk/gtk.h | 10 +
gtk/gtkbutton.c | 121 +--
gtk/gtkbuttonprivate.h | 3 +
gtk/gtkcellrendereraccel.c | 4 -
gtk/gtkcolorplane.c | 225 +++--
gtk/gtkcolorscale.c | 57 +-
gtk/gtkcolorswatch.c | 146 ++--
gtk/gtkcombobox.c | 2 -
gtk/gtkdnd.c | 102 +--
gtk/gtkentry.c | 709 ++++++++-------
gtk/gtkenums.h | 80 ++
gtk/gtkeventcontroller.c | 314 +++++++
gtk/gtkeventcontroller.h | 64 ++
gtk/gtkeventcontrollerprivate.h | 42 +
gtk/gtkgesture.c | 1596 ++++++++++++++++++++++++++++++++++
gtk/gtkgesture.h | 120 +++
gtk/gtkgesturedrag.c | 272 ++++++
gtk/gtkgesturedrag.h | 58 ++
gtk/gtkgesturedragprivate.h | 47 +
gtk/gtkgesturelongpress.c | 268 ++++++
gtk/gtkgesturelongpress.h | 49 ++
gtk/gtkgesturelongpressprivate.h | 44 +
gtk/gtkgesturemultipress.c | 465 ++++++++++
gtk/gtkgesturemultipress.h | 56 ++
gtk/gtkgesturemultipressprivate.h | 48 +
gtk/gtkgesturepan.c | 343 ++++++++
gtk/gtkgesturepan.h | 58 ++
gtk/gtkgesturepanprivate.h | 42 +
gtk/gtkgestureprivate.h | 75 ++
gtk/gtkgesturerotate.c | 227 +++++
gtk/gtkgesturerotate.h | 54 ++
gtk/gtkgesturerotateprivate.h | 42 +
gtk/gtkgesturesingle.c | 504 +++++++++++
gtk/gtkgesturesingle.h | 75 ++
gtk/gtkgesturesingleprivate.h | 40 +
gtk/gtkgestureswipe.c | 279 ++++++
gtk/gtkgestureswipe.h | 55 ++
gtk/gtkgestureswipeprivate.h | 43 +
gtk/gtkgesturezoom.c | 220 +++++
gtk/gtkgesturezoom.h | 54 ++
gtk/gtkgesturezoomprivate.h | 41 +
gtk/gtkiconview.c | 5 -
gtk/gtkmarshalers.list | 1 +
gtk/gtkpaned.c | 292 +++----
gtk/gtkpopover.c | 3 +-
gtk/gtkpressandhold.c | 257 ------
gtk/gtkpressandholdprivate.h | 63 --
gtk/gtkrange.c | 58 +-
gtk/gtkscrolledwindow.c | 674 ++++++--------
gtk/gtksettings.c | 19 +-
gtk/gtkspinbutton.c | 53 +-
gtk/gtkswitch.c | 255 +++---
gtk/gtktexthandle.c | 23 +-
gtk/gtktextview.c | 714 ++++++++-------
gtk/gtktreeview.c | 119 ++-
gtk/gtkwidget.c | 661 +++++++++++++-
gtk/gtkwidget.h | 1 +
gtk/gtkwidgetprivate.h | 8 +
gtk/gtkwindow.c | 410 ++++-----
gtk/inspector/Makefile.am | 2 +
gtk/inspector/gestures.c | 262 ++++++
gtk/inspector/gestures.h | 54 ++
gtk/inspector/init.c | 2 +
gtk/inspector/widget-tree.c | 28 +
gtk/inspector/window.c | 4 +
gtk/inspector/window.h | 1 +
gtk/inspector/window.ui | 11 +
po/POTFILES.in | 1 +
79 files changed, 9072 insertions(+), 2468 deletions(-)

Upstream: git.gnome.org

  • Share