[gtk: 24/24] Merge branch 'wip/carlosg/controller' into 'master'



commit 1dcb76bc2690e604a2fbc81338c654bdac2be7ad
Merge: 2cf55c1686 3675f9ccb2
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue May 1 12:35:53 2018 +0000

    Merge branch 'wip/carlosg/controller' into 'master'
    
    carlosg/controller
    
    See merge request GNOME/gtk!131

 demos/gtk-demo/clipboard.c             |   8 +--
 demos/gtk-demo/dnd.c                   |   3 +-
 demos/gtk-demo/drawingarea.c           |   5 +-
 demos/gtk-demo/event_axes.c            |   6 +-
 demos/gtk-demo/font_features.c         |   3 +-
 demos/gtk-demo/fontplane.c             |  23 +++----
 demos/gtk-demo/fontplane.h             |   1 -
 demos/gtk-demo/gestures.c              |  16 ++---
 demos/gtk-demo/hypertext.c             |   4 +-
 demos/gtk-demo/paint.c                 |  11 ++--
 demos/icon-browser/iconbrowserwin.c    |   9 ++-
 demos/widget-factory/widget-factory.c  |   6 +-
 demos/widget-factory/widget-factory.ui |   5 ++
 docs/reference/gtk/gtk4-sections.txt   |   2 +
 examples/drawing.c                     |   9 ++-
 examples/search-bar.c                  |   3 +-
 gtk/gtkaboutdialog.c                   |  30 +--------
 gtk/gtkactionbar.c                     |   8 +--
 gtk/gtkappchooserwidget.c              |  10 +--
 gtk/gtkbutton.c                        |  17 +----
 gtk/gtkcalendar.c                      |  54 ++++++----------
 gtk/gtkcellrendereraccel.c             |  10 +--
 gtk/gtkcellrendererspin.c              |   6 +-
 gtk/gtkcellview.c                      |  14 ++++-
 gtk/gtkcenterbox.c                     |   6 +-
 gtk/gtkcoloreditor.c                   |  32 +++++-----
 gtk/gtkcolorplane.c                    |  33 +++++-----
 gtk/gtkcolorscale.c                    |  21 ++-----
 gtk/gtkcolorswatch.c                   |  29 +++++----
 gtk/gtkcombobox.c                      |  25 +++-----
 gtk/gtkcontainer.c                     |  20 +++---
 gtk/gtkdialog.c                        |   2 +-
 gtk/gtkdragsource.c                    |   6 +-
 gtk/gtkemojichooser.c                  |  34 +---------
 gtk/gtkemojicompletion.c               |  10 ++-
 gtk/gtkentry.c                         |  28 ++++-----
 gtk/gtkentrycompletion.c               |  10 +--
 gtk/gtkeventcontroller.c               |  50 +++++++--------
 gtk/gtkeventcontroller.h               |   1 -
 gtk/gtkeventcontrollerkey.c            |   5 +-
 gtk/gtkeventcontrollerkey.h            |   2 +-
 gtk/gtkeventcontrollerlegacy.c         |  11 ++--
 gtk/gtkeventcontrollerlegacyprivate.h  |   6 +-
 gtk/gtkeventcontrollermotion.c         |   9 +--
 gtk/gtkeventcontrollermotion.h         |   2 +-
 gtk/gtkeventcontrollerprivate.h        |   3 +
 gtk/gtkeventcontrollerscroll.c         |  10 +--
 gtk/gtkeventcontrollerscroll.h         |   3 +-
 gtk/gtkexpander.c                      |  26 ++++----
 gtk/gtkfilechooserwidget.c             |  25 +-------
 gtk/gtkflowbox.c                       |  33 +++++-----
 gtk/gtkfontchooserwidget.c             |  19 +-----
 gtk/gtkframe.c                         |   8 ++-
 gtk/gtkgesture.c                       |   3 +
 gtk/gtkgesturedrag.c                   |   6 +-
 gtk/gtkgesturedrag.h                   |   2 +-
 gtk/gtkgesturelongpress.c              |   6 +-
 gtk/gtkgesturelongpress.h              |   2 +-
 gtk/gtkgesturemultipress.c             |   6 +-
 gtk/gtkgesturemultipress.h             |   2 +-
 gtk/gtkgesturepan.c                    |   6 +-
 gtk/gtkgesturepan.h                    |   3 +-
 gtk/gtkgesturerotate.c                 |   6 +-
 gtk/gtkgesturerotate.h                 |   2 +-
 gtk/gtkgesturestylus.c                 |   4 +-
 gtk/gtkgesturestylus.h                 |   2 +-
 gtk/gtkgestureswipe.c                  |   6 +-
 gtk/gtkgestureswipe.h                  |  10 +--
 gtk/gtkgesturezoom.c                   |   6 +-
 gtk/gtkgesturezoom.h                   |   2 +-
 gtk/gtkheaderbar.c                     |   8 ++-
 gtk/gtkiconview.c                      |  38 +++++++----
 gtk/gtkiconviewprivate.h               |   2 -
 gtk/gtkimcontextwayland.c              |  10 ++-
 gtk/gtklabel.c                         |  18 +++---
 gtk/gtklinkbutton.c                    |  17 +++--
 gtk/gtklistbox.c                       |  29 ++++-----
 gtk/gtkmenu.c                          |  44 +++++++------
 gtk/gtkmenuitem.c                      |   8 ++-
 gtk/gtkmenuprivate.h                   |   3 -
 gtk/gtkmenushell.c                     |   8 +--
 gtk/gtkmountoperation.c                |  13 ++--
 gtk/gtknotebook.c                      |  76 ++++++++++++----------
 gtk/gtkoverlay.c                       |  25 +++++---
 gtk/gtkpadcontroller.c                 |  15 +++--
 gtk/gtkpadcontroller.h                 |   3 +-
 gtk/gtkpaned.c                         |  18 +++---
 gtk/gtkpathbar.c                       |  14 ++---
 gtk/gtkplacessidebar.c                 |  21 +++----
 gtk/gtkplacesview.c                    |   9 +--
 gtk/gtkplacesviewrow.c                 |  11 +---
 gtk/gtkrange.c                         |  41 ++++++------
 gtk/gtkscalebutton.c                   |  12 ++--
 gtk/gtkscrolledwindow.c                |  63 +++++++------------
 gtk/gtksearchbar.c                     |   6 +-
 gtk/gtksearchentry.c                   |   6 +-
 gtk/gtkshortcutssection.c              |  10 +--
 gtk/gtkshortcutswindow.c               |   8 +--
 gtk/gtkspinbutton.c                    |  66 +++++++++----------
 gtk/gtkswitch.c                        |  10 ++-
 gtk/gtktextview.c                      |  33 +++++-----
 gtk/gtktoolbar.c                       |  16 +++--
 gtk/gtktreeview.c                      |  51 ++++++++-------
 gtk/gtktypes.h                         |   1 +
 gtk/gtkvideo.c                         |  59 ++++++++---------
 gtk/gtkwidget.c                        | 112 ++++++++++++++++++++-------------
 gtk/gtkwidget.h                        |   6 ++
 gtk/gtkwidgetprivate.h                 |   4 --
 gtk/gtkwindow.c                        |  16 ++---
 gtk/inspector/object-tree.c            |   3 +-
 gtk/inspector/prop-list.c              |   3 +-
 gtk/inspector/resource-list.c          |   3 +-
 gtk/inspector/statistics.c             |   3 +-
 gtk/ui/gtkaboutdialog.ui               |  30 +++++++++
 gtk/ui/gtkemojichooser.ui              |  33 ++++++++++
 gtk/ui/gtkfilechooserwidget.ui         |  17 +++++
 gtk/ui/gtkfontchooserwidget.ui         |  12 ++++
 gtk/ui/gtkplacesviewrow.ui             |   6 ++
 gtk/ui/gtkvideo.ui                     |   5 ++
 tests/testentryicons.c                 |   3 +-
 tests/testgtk.c                        |   4 +-
 tests/testinput.c                      |   3 +-
 tests/testoverlay.c                    |   4 +-
 tests/testtreeedit.c                   |   4 +-
 testsuite/gtk/gestures.c               |   6 +-
 125 files changed, 897 insertions(+), 958 deletions(-)
---
diff --cc gtk/gtkdragsource.c
index 3d228effa6,b13be2e367..8cc461464e
--- a/gtk/gtkdragsource.c
+++ b/gtk/gtkdragsource.c
@@@ -144,9 -145,9 +145,9 @@@ gtk_drag_source_set (GtkWidget         
      {
        site = g_slice_new0 (GtkDragSourceSite);
        site->image_def = gtk_image_definition_new_empty ();
-       site->drag_gesture = gtk_gesture_drag_new (widget);
+       site->drag_gesture = gtk_gesture_drag_new ();
        gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (site->drag_gesture),
 -                                                  GTK_PHASE_BUBBLE);
 +                                                  GTK_PHASE_CAPTURE);
        gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (site->drag_gesture), 0);
        g_signal_connect (site->drag_gesture, "begin",
                          G_CALLBACK (gtk_drag_source_gesture_begin),


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