[gtk: 18/18] Merge branch 'wip/otte/dnd' into 'master'
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 18/18] Merge branch 'wip/otte/dnd' into 'master'
- Date: Mon, 2 Mar 2020 18:10:10 +0000 (UTC)
commit 47230f191f2b4e16a3038303567f8b8bb0d515f5
Merge: 35f8f05a63 0e72adf6dd
Author: Benjamin Otte <otte benjamin googlemail com>
Date: Mon Mar 2 18:09:05 2020 +0000
Merge branch 'wip/otte/dnd' into 'master'
DND: Sync drop target
See merge request GNOME/gtk!1495
demos/gtk-demo/clipboard.c | 48 +-
demos/gtk-demo/demo.gresource.xml | 1 +
demos/gtk-demo/meson.build | 1 +
demos/gtk-demo/peg_solitaire.c | 356 +++++++++++++
docs/reference/gdk/gdk4-sections.txt | 2 -
docs/reference/gtk/gtk4-sections.txt | 38 +-
gdk/gdkcontentformats.c | 8 +-
gdk/gdkcontentformats.h | 4 +-
gdk/gdkdrop.c | 106 +---
gdk/gdkdrop.h | 16 +-
gdk/gdkdropprivate.h | 3 +-
gdk/wayland/gdkdrop-wayland.c | 20 +-
gdk/win32/gdkdrop-win32.c | 8 +-
gdk/x11/gdkdrop-x11.c | 23 +-
gtk/gtk.h | 3 +-
gtk/gtkcalendar.c | 382 +++-----------
gtk/gtkcolorbutton.c | 62 +--
gtk/gtkcolorswatch.c | 77 +--
gtk/gtkdragdest.c | 871 ------------------------------
gtk/gtkdragdest.h | 83 ---
gtk/gtkdragicon.c | 259 ++++++---
gtk/gtkdragicon.h | 11 +-
gtk/gtkdragiconprivate.h | 42 --
gtk/gtkdragsource.c | 66 ++-
gtk/gtkdrop.c | 113 ++++
gtk/gtkdropprivate.h | 38 ++
gtk/gtkdroptarget.c | 990 +++++++++++++++++++++++++++++++++++
gtk/gtkdroptarget.h | 86 +++
gtk/gtkdroptargetasync.c | 673 ++++++++++++++++++++++++
gtk/gtkdroptargetasync.h | 77 +++
gtk/gtkfilechooserbutton.c | 292 ++++-------
gtk/gtkfilechooserwidget.c | 56 +-
gtk/gtkiconview.c | 100 ++--
gtk/gtkiconview.h | 4 +-
gtk/gtkiconviewprivate.h | 5 +-
gtk/gtklistbox.c | 1 -
gtk/gtkmain.c | 35 +-
gtk/gtknotebook.c | 273 ++++------
gtk/gtkplacessidebar.c | 346 ++++--------
gtk/gtkplacessidebarprivate.h | 3 +-
gtk/gtktext.c | 183 +++----
gtk/gtktextview.c | 349 ++++++------
gtk/gtktreeview.c | 108 ++--
gtk/gtktreeview.h | 4 +-
gtk/gtktreeviewcolumn.c | 1 +
gtk/gtkwidget.c | 2 +-
gtk/gtkwindow.c | 32 +-
gtk/meson.build | 7 +-
gtk/theme/Adwaita/_common.scss | 4 +
gtk/theme/HighContrast/_common.scss | 4 +
tests/testdnd.c | 214 +++-----
tests/testdnd2.c | 26 +-
tests/testdnd3.c | 88 +---
tests/testlist3.c | 39 +-
tests/testnotebookdnd.c | 50 +-
tests/testtreednd.c | 24 +-
testsuite/gtk/defaultvalue.c | 3 +-
testsuite/gtk/filtermodel.c | 20 +-
58 files changed, 3633 insertions(+), 3107 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]