GdkScreen: get a long X property correctly

[~andy/gtk] / gdk / gdkdnd.h

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 76e7a293ccc2f5c955dbb1c4520a7e2709c8065f..c9fa16a0e87658c38e66c8048cf863c69683e4be 100644 (file)
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -12,9 +12,7 @@
  * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,23 +22,21 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GDK_DND_H__
+#define __GDK_DND_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_DND_H__
-#define __GDK_DND_H__
-
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdevice.h>
 
 G_BEGIN_DECLS
 
-/* Object that holds information about a drag in progress.
- * this is used on both source and destination sides.
- */
-typedef struct _GdkDragContext        GdkDragContext;
-typedef struct _GdkDragContextClass GdkDragContextClass;
+#define GDK_TYPE_DRAG_CONTEXT              (gdk_drag_context_get_type ())
+#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:
@@ -69,11 +65,11 @@ typedef enum
 
 /**
  * GdkDragProtocol:
+ * @GDK_DRAG_PROTO_NONE: no protocol.
  * @GDK_DRAG_PROTO_MOTIF: The Motif DND protocol.
  * @GDK_DRAG_PROTO_XDND: The Xdnd protocol.
  * @GDK_DRAG_PROTO_ROOTWIN: An extension to the Xdnd protocol for
  *  unclaimed root window drops.
- * @GDK_DRAG_PROTO_NONE: no protocol.
  * @GDK_DRAG_PROTO_WIN32_DROPFILES: The simple WM_DROPFILES protocol.
  * @GDK_DRAG_PROTO_OLE2: The complex OLE2 DND protocol (not implemented).
  * @GDK_DRAG_PROTO_LOCAL: Intra-application DND.
@@ -83,24 +79,16 @@ typedef enum
  */
 typedef enum
 {
+  GDK_DRAG_PROTO_NONE = 0,
   GDK_DRAG_PROTO_MOTIF,
   GDK_DRAG_PROTO_XDND,
   GDK_DRAG_PROTO_ROOTWIN,
-  GDK_DRAG_PROTO_NONE,
   GDK_DRAG_PROTO_WIN32_DROPFILES,
   GDK_DRAG_PROTO_OLE2,
   GDK_DRAG_PROTO_LOCAL
 } GdkDragProtocol;
 
 
-#define GDK_TYPE_DRAG_CONTEXT              (gdk_drag_context_get_type ())
-#define GDK_DRAG_CONTEXT(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DRAG_CONTEXT, GdkDragContext))
-#define GDK_DRAG_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-#define GDK_IS_DRAG_CONTEXT(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_IS_DRAG_CONTEXT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DRAG_CONTEXT))
-#define GDK_DRAG_CONTEXT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DRAG_CONTEXT, GdkDragContextClass))
-
-
 GType            gdk_drag_context_get_type             (void) G_GNUC_CONST;
 
 void             gdk_drag_context_set_device           (GdkDragContext *context,
@@ -119,14 +107,14 @@ GdkDragProtocol  gdk_drag_context_get_protocol         (GdkDragContext *context)
 /* Destination side */
 
 void             gdk_drag_status        (GdkDragContext   *context,
-                                        GdkDragAction     action,
-                                        guint32           time_);
+                                         GdkDragAction     action,
+                                         guint32           time_);
 void             gdk_drop_reply         (GdkDragContext   *context,
-                                        gboolean          accepted,
-                                        guint32           time_);
+                                         gboolean          accepted,
+                                         guint32           time_);
 void             gdk_drop_finish        (GdkDragContext   *context,
-                                        gboolean          success,
-                                        guint32           time_);
+                                         gboolean          success,
+                                         guint32           time_);
 GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
 
 /* Source side */
@@ -138,30 +126,26 @@ GdkDragContext * gdk_drag_begin_for_device (GdkWindow      *window,
                                             GdkDevice      *device,
                                             GList          *targets);
 
-GdkNativeWindow gdk_drag_get_protocol_for_display (GdkDisplay       *display,
-                                                  GdkNativeWindow   xid,
-                                                  GdkDragProtocol  *protocol);
-
 void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
-                                          GdkWindow        *drag_window,
-                                          GdkScreen        *screen,
-                                          gint              x_root,
-                                          gint              y_root,
-                                          GdkWindow       **dest_window,
-                                          GdkDragProtocol  *protocol);
+                                           GdkWindow        *drag_window,
+                                           GdkScreen        *screen,
+                                           gint              x_root,
+                                           gint              y_root,
+                                           GdkWindow       **dest_window,
+                                           GdkDragProtocol  *protocol);
 
 gboolean        gdk_drag_motion      (GdkDragContext *context,
-                                     GdkWindow      *dest_window,
-                                     GdkDragProtocol protocol,
-                                     gint            x_root, 
-                                     gint            y_root,
-                                     GdkDragAction   suggested_action,
-                                     GdkDragAction   possible_actions,
-                                     guint32         time_);
+                                      GdkWindow      *dest_window,
+                                      GdkDragProtocol protocol,
+                                      gint            x_root,
+                                      gint            y_root,
+                                      GdkDragAction   suggested_action,
+                                      GdkDragAction   possible_actions,
+                                      guint32         time_);
 void            gdk_drag_drop        (GdkDragContext *context,
-                                     guint32         time_);
+                                      guint32         time_);
 void            gdk_drag_abort       (GdkDragContext *context,
-                                     guint32         time_);
+                                      guint32         time_);
 gboolean        gdk_drag_drop_succeeded (GdkDragContext *context);
 
 G_END_DECLS