[gtk: 5/5] Merge branch 'dnd-cleanups' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 5/5] Merge branch 'dnd-cleanups' into 'master'
- Date: Mon, 2 Jul 2018 21:21:29 +0000 (UTC)
commit 12464731f1dc69a0f7105f2d7f0ba20fe9c215fa
Merge: 269a9d8528 c8e082f296
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Jul 2 21:19:45 2018 +0000
Merge branch 'dnd-cleanups' into 'master'
Dnd cleanups
See merge request GNOME/gtk!226
demos/gtk-demo/clipboard.c | 6 +-
demos/icon-browser/iconbrowserwin.c | 4 +-
docs/reference/gdk/gdk4-sections.txt | 56 ++-
gdk/broadway/gdkdnd-broadway.c | 62 +--
gdk/broadway/gdkprivate-broadway.h | 2 +-
gdk/gdk-autocleanup.h | 2 +-
gdk/gdk.h | 2 +-
gdk/gdkdnd.h | 100 ----
gdk/gdkdndprivate.h | 105 -----
gdk/{gdkdnd.c => gdkdrag.c} | 365 ++++++++-------
gdk/gdkdrag.h | 98 ++++
gdk/gdkdragprivate.h | 105 +++++
gdk/gdkdrop.c | 10 +-
gdk/gdkdrop.h | 2 +-
gdk/gdkevents.c | 4 +-
gdk/gdkevents.h | 2 +-
gdk/gdkeventsprivate.h | 2 +-
gdk/gdkinternals.h | 2 +-
gdk/gdksurface.c | 4 +-
gdk/gdksurfaceimpl.h | 2 +-
gdk/gdktypes.h | 4 +-
gdk/meson.build | 4 +-
gdk/wayland/gdkdevice-wayland.c | 8 +-
gdk/wayland/gdkdnd-wayland.c | 270 +++++------
gdk/wayland/gdkdrop-wayland.c | 2 +-
gdk/wayland/gdkprivate-wayland.h | 20 +-
gdk/wayland/gdkselection-wayland.c | 1 -
gdk/win32/gdkclipdrop-win32.c | 2 +-
gdk/win32/gdkdrag-win32.c | 360 ++++++++-------
gdk/win32/gdkdrop-win32.c | 22 +-
gdk/win32/gdkevents-win32.c | 4 +-
gdk/win32/gdkprivate-win32.h | 12 +-
gdk/win32/gdkwin32dnd-private.h | 34 +-
gdk/win32/gdkwin32dnd.h | 22 +-
gdk/x11/gdkdnd-x11.c | 868 +++++++++++++++++------------------
gdk/x11/gdkdrop-x11.c | 16 +-
gdk/x11/gdkprivate-x11.h | 22 +-
gdk/x11/gdkx-autocleanups.h | 2 +-
gdk/x11/gdkx11dnd.h | 22 +-
gtk/gtkcalendar.c | 16 +-
gtk/gtkcolorbutton.c | 14 +-
gtk/gtkcolorswatch.c | 10 +-
gtk/gtkdnd.c | 205 ++++-----
gtk/gtkdnd.h | 26 +-
gtk/gtkdndprivate.h | 4 +-
gtk/gtkdragdest.c | 2 +-
gtk/gtkentry.c | 22 +-
gtk/gtkiconview.c | 52 +--
gtk/gtklabel.c | 10 +-
gtk/gtklinkbutton.c | 4 +-
gtk/gtknotebook.c | 36 +-
gtk/gtkpathbar.c | 2 +-
gtk/gtkplacessidebar.c | 10 +-
gtk/gtktextview.c | 24 +-
gtk/gtktreeview.c | 54 ++-
gtk/gtkwidget.c | 12 +-
gtk/gtkwidget.h | 12 +-
tests/testdnd.c | 6 +-
tests/testdnd2.c | 28 +-
tests/testentryicons.c | 6 +-
tests/testimage.c | 8 +-
tests/testlist3.c | 6 +-
tests/testnotebookdnd.c | 4 +-
63 files changed, 1604 insertions(+), 1599 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]