From ff38d3844456bb3af989b82523e207738f1abd37 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 30 May 2018 21:12:43 +0200 Subject: [PATCH] dnd: Move GdkDragAction to gdktypes.h That way, both gdkdrag.h and gdkdrop.h can use it without one having to include the other. --- gdk/gdkdnd.h | 29 ----------------------------- gdk/gdktypes.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index 365e9cf4cb..506aa93aeb 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -39,35 +39,6 @@ G_BEGIN_DECLS #define GDK_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext)) #define GDK_IS_DRAG_CONTEXT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT)) -/** - * GdkDragAction: - * @GDK_ACTION_COPY: Copy the data. - * @GDK_ACTION_MOVE: Move the data, i.e. first copy it, then delete - * it from the source using the DELETE target of the X selection protocol. - * @GDK_ACTION_LINK: Add a link to the data. Note that this is only - * useful if source and destination agree on what it means. - * @GDK_ACTION_ASK: Ask the user what to do with the data. - * - * Used in #GdkDragContext to indicate what the destination - * should do with the dropped data. - */ -typedef enum -{ - GDK_ACTION_COPY = 1 << 0, - GDK_ACTION_MOVE = 1 << 1, - GDK_ACTION_LINK = 1 << 2, - GDK_ACTION_ASK = 1 << 3 -} GdkDragAction; - -/** - * GDK_ACTION_ALL: - * - * Defines all possible DND actions. This can be used in gdk_drop_status() - * messages when any drop can be accepted or a more specific drop method - * is not yet known. - */ -#define GDK_ACTION_ALL (GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK) - /** * GdkDragCancelReason: * @GDK_DRAG_CANCEL_NO_TARGET: There is no suitable drop target. diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index ba799fb4ce..cdd5808e78 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -576,6 +576,35 @@ typedef enum GDK_AXIS_FLAG_SLIDER = 1 << GDK_AXIS_SLIDER, } GdkAxisFlags; +/** + * GdkDragAction: + * @GDK_ACTION_COPY: Copy the data. + * @GDK_ACTION_MOVE: Move the data, i.e. first copy it, then delete + * it from the source using the DELETE target of the X selection protocol. + * @GDK_ACTION_LINK: Add a link to the data. Note that this is only + * useful if source and destination agree on what it means. + * @GDK_ACTION_ASK: Ask the user what to do with the data. + * + * Used in #GdkDragContext to indicate what the destination + * should do with the dropped data. + */ +typedef enum +{ + GDK_ACTION_COPY = 1 << 0, + GDK_ACTION_MOVE = 1 << 1, + GDK_ACTION_LINK = 1 << 2, + GDK_ACTION_ASK = 1 << 3 +} GdkDragAction; + +/** + * GDK_ACTION_ALL: + * + * Defines all possible DND actions. This can be used in gdk_drop_status() + * messages when any drop can be accepted or a more specific drop method + * is not yet known. + */ +#define GDK_ACTION_ALL (GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK) + G_END_DECLS #endif /* __GDK_TYPES_H__ */ -- 2.30.2