Remove gtkdnd.h

diff --git a/gtk/gtk.h b/gtk/gtk.h
index a64a2a826ab601fd4a042d1918aa2347116a539a..bc401dce40525f62f2c65e878dc8f49b498c509d 100644 (file)
--- 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 b9c0407e8ffac9a5b3c3c64486fb814d5483ba61..cc224fdcb6177cb672b76f14445bdc2a78c46e4d 100644 (file)
--- 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 0a445c2e24b39ebae513f035a8c16dd27a34e5bd..6257384af54a8d9105b2c3c01c2ba1ce403baa19 100644 (file)
--- 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 c8b7641227e9dbf06f818fa6b63d8d17cd97506c..88258cc7b0a124266114dbb73126d8879059ef12 100644 (file)
--- 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/gtkdnd.h b/gtk/gtkdnd.h
deleted file mode 100644 (file)
index 1fab2f4..0000000
--- a/gtk/gtkdnd.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_DND_H__
-#define __GTK_DND_H__
-
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
-
-
-G_BEGIN_DECLS
-
-/* Destination side */
-
-
-G_END_DECLS
-
-#endif /* __GTK_DND_H__ */

diff --git a/gtk/gtkdndprivate.h b/gtk/gtkdndprivate.h
index 65dce27d7e64fdf65b039e2060b81b35a4e9c947..54826d7b0c780563b2c0dd6c1038ace8afe11fa5 100644 (file)
--- 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 00cb19e6cc0b23c6ddd3c27bb6e0f100b7308e84..5a4728f117f8685baeb37fe0515604e25d7a9a2c 100644 (file)
--- 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 653f112b683154d9cf933f0af49ba2036531f034..7c3b249a33b5328b2d6c6fbc902ee9b531aadf99 100644 (file)
--- 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 6ac31625228e22c912f4503dd0a1c42fa9ffa750..db33c193aa008fba93ebd491a5e6ed5dc244539f 100644 (file)
--- 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 e15e658923b5b5d916ad83574e6e5f2c86dcee6a..c6ed89cbe7e383a77a523151457f385b843af478 100644 (file)
--- 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 aebb32db587ba1bf72891b42fcaa5ee70910e471..2a6eb3391611390097fe5d3f461d042dc171fafb 100644 (file)
--- 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 d935971f4236ad29d4255d6298df4559e4f387c6..1a7c635afb4c05a6d3518fe170ff40dbfc89679d 100644 (file)
--- 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 182ebcea1e4071247f0f543d130befb99b1bd7e4..e29a164897c064007bbe80865318f8c77705f722 100644 (file)
--- 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 e2c2a97843d6205fe89726f6a5b52e4173215b91..5675b6c1d4edc1e5e879d26626f672df278800c2 100644 (file)
--- 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 3f1e9a6d32d5d16fae6d31375b14759d4adf6f6f..8c094cb9460f9d3ae0fae663f766bdd5e94d19a2 100644 (file)
--- 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 f80f5bacc5598becaee1f4cc8d96068fa486a6bf..eaa17307a302652277491251af2f13750e6060b8 100644 (file)
--- 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 093e1d2d106bcdf00b03df954f4bab3765bc13e3..dbcda6083c00525be362e5763a0aad17865ed042 100644 (file)
--- 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 0b5c5ff6564951fb5db3979345fa98daa537849c..6780f255200964893f128579d06478a7c346ef7a 100644 (file)
--- 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 de1f2ceb01d4ec73d30d3e2c72d6e46d31c41fbb..81697c00d5d7ce24c220670074337d0a371238f7 100644 (file)
--- 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 3e50c4fb20fddcded3990ca22ea61523d819262b..5ec18f7c5ee1c66977fccfca695245f38842e2f0 100644 (file)
--- 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 4ad534ce7bb5cf2aa4125d59fe77cbce1326b06d..472faf854f9fd1b3d933a70de538c71691ae7d22 100644 (file)
--- 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 aaa3591aefd0a61f7eb387bdafa32d1fdfbb54ad..0beca10587fe35f95d797b20ee5b9e2d01bd4b12 100644 (file)
--- 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 ca03048105febf2e4573151c8804593c5d4e4d86..46d907e9889efac32100f3bbd0d1cbd63a844baa 100644 (file)
--- 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 0e0fa9c3f3ddc2d3f055cc79b503468510516f36..dba2da04e7bd93de2e0f9dd2270d8cc3a6b2cb85 100644 (file)
--- 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 8e9686069c111750934af439b3ec7707ea2f00cb..40ae032cfd248f20414393b7097904eec612ea52 100644 (file)
--- 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',