[gtk/dnd-gestures-2: 34/34] Remove gtkdnd.h

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/dnd-gestures-2: 34/34] Remove gtkdnd.h
Date: Fri, 3 Jan 2020 23:08:59 +0000 (UTC)
commit 89d459cb9c8723cc9f18168f54fc3757181cddc6
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 3 16:32:46 2020 -0500

    Remove gtkdnd.h

 gtk/gtk.h                  |  1 -
 gtk/gtkcalendar.c          |  1 -
 gtk/gtkcolorbutton.c       |  1 -
 gtk/gtkcolorswatch.c       |  1 -
 gtk/gtkdnd.h               | 45 ---------------------------------------------
 gtk/gtkdndprivate.h        | 15 ---------------
 gtk/gtkdragdest.c          |  1 -
 gtk/gtkdragsource.c        |  1 -
 gtk/gtkentry.c             |  1 -
 gtk/gtkexpander.c          |  1 -
 gtk/gtkfilechooserbutton.c |  1 -
 gtk/gtkiconview.c          |  1 -
 gtk/gtklabel.c             |  1 -
 gtk/gtknotebook.c          |  1 -
 gtk/gtkpathbar.c           |  1 -
 gtk/gtkplacessidebar.c     |  1 -
 gtk/gtkscrolledwindow.c    |  1 -
 gtk/gtkstackswitcher.c     |  1 -
 gtk/gtktext.c              |  1 -
 gtk/gtktextbuffer.c        |  1 -
 gtk/gtktextutil.h          |  2 ++
 gtk/gtktextview.c          |  1 -
 gtk/gtktreednd.h           |  2 +-
 gtk/gtktreeview.h          |  1 -
 gtk/meson.build            |  1 -
 25 files changed, 3 insertions(+), 82 deletions(-)
---
diff --git a/gtk/gtk.h b/gtk/gtk.h
index a64a2a826a..bc401dce40 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -90,7 +90,6 @@
 #include <gtk/gtkcustomlayout.h>
 #include <gtk/gtkdebug.h>
 #include <gtk/gtkdialog.h>
-#include <gtk/gtkdnd.h>
 #include <gtk/gtkdragdest.h>
 #include <gtk/gtkdragsource.h>
 #include <gtk/gtkdrawingarea.h>
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index b9c0407e8f..cc224fdcb6 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -72,7 +72,6 @@
 #endif
 
 #include "gtkcalendar.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 967e2b6ba7..ac904b9f4d 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -36,7 +36,6 @@
 #include "gtkcolorchooserprivate.h"
 #include "gtkcolorchooserdialog.h"
 #include "gtkcolorswatchprivate.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkdragsource.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 5242c09379..1c72cfa331 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -22,7 +22,6 @@
 #include "gtkbox.h"
 #include "gtkcolorchooserprivate.h"
 #include "gtkcssnodeprivate.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkdragsource.h"
 #include "gtkgesturelongpress.h"
diff --git a/gtk/gtkdndprivate.h b/gtk/gtkdndprivate.h
index 65dce27d7e..54826d7b0c 100644
--- a/gtk/gtkdndprivate.h
+++ b/gtk/gtkdndprivate.h
@@ -19,8 +19,6 @@
 #ifndef __GTK_DND_PRIVATE_H__
 #define __GTK_DND_PRIVATE_H__
 
-#include "gtkdnd.h"
-
 #include "gtkdragdest.h"
 #include "gtkimagedefinitionprivate.h"
 #include "gtkselection.h"
@@ -31,24 +29,11 @@ struct _GtkDragDestSite
 {
   GtkDropTarget     *dest;
   GtkDestDefaults    flags;
-  guint              do_proxy     : 1;
-  guint              proxy_coords : 1;
   guint              have_drag    : 1;
 };
 
 G_BEGIN_DECLS
 
-GdkDrag *               gtk_drag_begin_internal         (GtkWidget              *widget,
-                                                         GdkDevice              *device,
-                                                         GtkImageDefinition     *icon,
-                                                         GdkContentFormats      *target_list,
-                                                         GdkDragAction           actions,
-                                                         int                     x,
-                                                         int                     y);
-void                    gtk_drag_set_icon_definition    (GdkDrag                *drag,
-                                                         GtkImageDefinition     *def,
-                                                         gint                    hot_x,
-                                                         gint                    hot_y);
 void                    _gtk_drag_dest_handle_event     (GtkWidget              *toplevel,
                                                         GdkEvent               *event);
 
diff --git a/gtk/gtkdragdest.c b/gtk/gtkdragdest.c
index 3576b406f9..436fb72bb4 100644
--- a/gtk/gtkdragdest.c
+++ b/gtk/gtkdragdest.c
@@ -27,7 +27,6 @@
 #include "gtkdragdest.h"
 #include "gtkdragdestprivate.h"
 
-#include "gtkdnd.h"
 #include "gtkdndprivate.h"
 #include "gtkintl.h"
 #include "gtknative.h"
diff --git a/gtk/gtkdragsource.c b/gtk/gtkdragsource.c
index 1f4930b3a9..3dfe20cdab 100644
--- a/gtk/gtkdragsource.c
+++ b/gtk/gtkdragsource.c
@@ -26,7 +26,6 @@
 
 #include "gtkdragsource.h"
 
-#include "gtkdnd.h"
 #include "gtkdndprivate.h"
 #include "gtkgesturedrag.h"
 #include "gtkgesturesingleprivate.h"
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 6ac3162522..db33c193aa 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -38,7 +38,6 @@
 #include "gtkcelllayout.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkdebug.h"
-#include "gtkdnd.h"
 #include "gtkdndprivate.h"
 #include "gtkeditable.h"
 #include "gtkemojichooser.h"
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index e15e658923..c6ed89cbe7 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -115,7 +115,6 @@
 #include "gtkbox.h"
 #include "gtkbuildable.h"
 #include "gtkcontainerprivate.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkiconprivate.h"
 #include "gtkgestureclick.h"
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index aebb32db58..2a6eb33916 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -37,7 +37,6 @@
 #include "gtkcellrendererpixbuf.h"
 #include "gtkcombobox.h"
 #include "gtkcssiconthemevalueprivate.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkicontheme.h"
 #include "gtkimage.h"
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index d935971f42..1a7c635afb 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -30,7 +30,6 @@
 #include "gtkcellrenderertext.h"
 #include "gtkcombobox.h"
 #include "gtkcssnodeprivate.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkdragsource.h"
 #include "gtkentry.h"
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index a137ac5ec3..be17f0ead4 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -32,7 +32,6 @@
 #include "gtkcssnodeprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
 #include "gtkcssstylepropertyprivate.h"
-#include "gtkdnd.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkgesturedrag.h"
 #include "gtkgestureclick.h"
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index e2c2a97843..5675b6c1d4 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -33,7 +33,6 @@
 #include "gtkbuildable.h"
 #include "gtkbutton.h"
 #include "gtkcssstylepropertyprivate.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkgestureclick.h"
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 3f1e9a6d32..8c094cb946 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -24,7 +24,6 @@
 
 #include "gtkbox.h"
 #include "gtkcssnodeprivate.h"
-#include "gtkdnd.h"
 #include "gtkdragsource.h"
 #include "gtkicontheme.h"
 #include "gtkimage.h"
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 0a39685066..7a27882adc 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -52,7 +52,6 @@
 #include "gtklistbox.h"
 #include "gtkselection.h"
 #include "gtkdragdest.h"
-#include "gtkdnd.h"
 #include "gtkseparator.h"
 #include "gtkentry.h"
 #include "gtkgesturelongpress.h"
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index cddf1c222b..9f8a965f50 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -29,7 +29,6 @@
 #include "gtkadjustment.h"
 #include "gtkadjustmentprivate.h"
 #include "gtkbindings.h"
-#include "gtkdnd.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerscroll.h"
 #include "gtkgesturedrag.h"
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index 0b5c5ff656..6780f25520 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -22,7 +22,6 @@
 #include "gtkstackswitcher.h"
 
 #include "gtkboxlayout.h"
-#include "gtkdnd.h"
 #include "gtkdragdest.h"
 #include "gtkimage.h"
 #include "gtkintl.h"
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index b7e04f0778..e3938147b8 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -30,7 +30,6 @@
 #include "gtkbutton.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkdebug.h"
-#include "gtkdnd.h"
 #include "gtkdndprivate.h"
 #include "gtkeditable.h"
 #include "gtkemojichooser.h"
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 3e50c4fb20..5ec18f7c5e 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "gtkdnd.h"
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h"
 #include "gtktexthistoryprivate.h"
diff --git a/gtk/gtktextutil.h b/gtk/gtktextutil.h
index 4ad534ce7b..472faf854f 100644
--- a/gtk/gtktextutil.h
+++ b/gtk/gtktextutil.h
@@ -27,6 +27,8 @@
 
 G_BEGIN_DECLS
 
+#include "gtktextbuffer.h"
+
 /* This is a private uninstalled header shared between
  * GtkTextView and GtkEntry
  */
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index aaa3591aef..0beca10587 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -31,7 +31,6 @@
 
 #include "gtkadjustmentprivate.h"
 #include "gtkbindings.h"
-#include "gtkdnd.h"
 #include "gtkdebug.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index ca03048105..46d907e988 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -22,8 +22,8 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gtk/gtkselection.h>
 #include <gtk/gtktreemodel.h>
-#include <gtk/gtkdnd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 0e0fa9c3f3..dba2da04e7 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -25,7 +25,6 @@
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkdnd.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkdragsource.h>
 #include <gtk/gtkdragdest.h>
diff --git a/gtk/meson.build b/gtk/meson.build
index 8e9686069c..40ae032cfd 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -473,7 +473,6 @@ gtk_public_headers = files([
   'gtkcustomlayout.h',
   'gtkdebug.h',
   'gtkdialog.h',
-  'gtkdnd.h',
   'gtkdragdest.h',
   'gtkdragsource.h',
   'gtkdrawingarea.h',
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]