Fix typos

[~andy/gtk] / gtk / gtkdnd.h

diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index e1c23b942b4e87c7ec2daa76e03c7b4bff9ff563..626ef00597fa6126043fb9469273cb132caaa4f0 100644 (file)
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
@@ -32,9 +33,7 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkselection.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
   GTK_DEST_DEFAULT_MOTION     = 1 << 0, /* respond to "drag_motion" */
@@ -55,11 +54,11 @@ typedef enum {
 void gtk_drag_get_data (GtkWidget      *widget,
                        GdkDragContext *context,
                        GdkAtom         target,
-                       guint32         time);
+                       guint32         time_);
 void gtk_drag_finish   (GdkDragContext *context,
                        gboolean        success,
                        gboolean        del,
-                       guint32         time);
+                       guint32         time_);
 
 GtkWidget *gtk_drag_get_source_widget (GdkDragContext *context);
 
@@ -77,12 +76,22 @@ void gtk_drag_dest_set_proxy (GtkWidget      *widget,
                              GdkDragProtocol protocol,
                              gboolean        use_coordinates);
 
-/* There probably should be functions for setting the targets
- * as a GtkTargetList
- */
-
 void gtk_drag_dest_unset (GtkWidget          *widget);
 
+GdkAtom        gtk_drag_dest_find_target     (GtkWidget      *widget,
+                                              GdkDragContext *context,
+                                              GtkTargetList  *target_list);
+GtkTargetList* gtk_drag_dest_get_target_list (GtkWidget      *widget);
+void           gtk_drag_dest_set_target_list (GtkWidget      *widget,
+                                              GtkTargetList  *target_list);
+void           gtk_drag_dest_add_text_targets  (GtkWidget    *widget);
+void           gtk_drag_dest_add_image_targets (GtkWidget    *widget);
+void           gtk_drag_dest_add_uri_targets   (GtkWidget    *widget);
+
+void           gtk_drag_dest_set_track_motion  (GtkWidget *widget,
+                                               gboolean   track_motion);
+gboolean       gtk_drag_dest_get_track_motion  (GtkWidget *widget);
+
 /* Source side */
 
 void gtk_drag_source_set  (GtkWidget            *widget,
@@ -93,10 +102,23 @@ void gtk_drag_source_set  (GtkWidget            *widget,
 
 void gtk_drag_source_unset (GtkWidget        *widget);
 
-void gtk_drag_source_set_icon (GtkWidget     *widget,
-                              GdkColormap   *colormap,
-                              GdkPixmap     *pixmap,
-                              GdkBitmap     *mask);
+GtkTargetList* gtk_drag_source_get_target_list (GtkWidget     *widget);
+void           gtk_drag_source_set_target_list (GtkWidget     *widget,
+                                                GtkTargetList *target_list);
+void           gtk_drag_source_add_text_targets  (GtkWidget     *widget);
+void           gtk_drag_source_add_image_targets (GtkWidget    *widget);
+void           gtk_drag_source_add_uri_targets   (GtkWidget    *widget);
+
+void gtk_drag_source_set_icon        (GtkWidget   *widget,
+                                     GdkColormap *colormap,
+                                     GdkPixmap   *pixmap,
+                                     GdkBitmap   *mask);
+void gtk_drag_source_set_icon_pixbuf (GtkWidget   *widget,
+                                     GdkPixbuf   *pixbuf);
+void gtk_drag_source_set_icon_stock  (GtkWidget   *widget,
+                                     const gchar *stock_id);
+void gtk_drag_source_set_icon_name   (GtkWidget   *widget,
+                                     const gchar *icon_name);
 
 /* There probably should be functions for setting the targets
  * as a GtkTargetList
@@ -110,27 +132,31 @@ GdkDragContext *gtk_drag_begin (GtkWidget         *widget,
 
 /* Set the image being dragged around
  */
-void gtk_drag_set_icon_widget  (GdkDragContext    *context,
-                               GtkWidget         *widget,
-                               gint               hot_x,
-                               gint               hot_y);
-
-void gtk_drag_set_icon_pixmap  (GdkDragContext    *context,
-                               GdkColormap       *colormap,
-                               GdkPixmap         *pixmap,
-                               GdkBitmap         *mask,
-                               gint               hot_x,
-                               gint               hot_y);
+void gtk_drag_set_icon_widget (GdkDragContext *context,
+                              GtkWidget      *widget,
+                              gint            hot_x,
+                              gint            hot_y);
+void gtk_drag_set_icon_pixmap (GdkDragContext *context,
+                              GdkColormap    *colormap,
+                              GdkPixmap      *pixmap,
+                              GdkBitmap      *mask,
+                              gint            hot_x,
+                              gint            hot_y);
+void gtk_drag_set_icon_pixbuf (GdkDragContext *context,
+                              GdkPixbuf      *pixbuf,
+                              gint            hot_x,
+                              gint            hot_y);
+void gtk_drag_set_icon_stock  (GdkDragContext *context,
+                              const gchar    *stock_id,
+                              gint            hot_x,
+                              gint            hot_y);
+void gtk_drag_set_icon_name   (GdkDragContext *context,
+                              const gchar    *icon_name,
+                              gint            hot_x,
+                              gint            hot_y);
 
 void gtk_drag_set_icon_default (GdkDragContext    *context);
 
-void gtk_drag_set_default_icon (GdkColormap   *colormap,
-                               GdkPixmap     *pixmap,
-                               GdkBitmap     *mask,
-                               gint           hot_x,
-                               gint           hot_y);
-
-
 gboolean gtk_drag_check_threshold (GtkWidget *widget,
                                   gint       start_x,
                                   gint       start_y,
@@ -138,14 +164,20 @@ gboolean gtk_drag_check_threshold (GtkWidget *widget,
                                   gint       current_y);
 
 /* Internal functions */
-void gtk_drag_source_handle_event (GtkWidget *widget,
-                                  GdkEvent  *event);
-void gtk_drag_dest_handle_event (GtkWidget *toplevel,
-                                GdkEvent  *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void _gtk_drag_source_handle_event (GtkWidget *widget,
+                                   GdkEvent  *event);
+void _gtk_drag_dest_handle_event (GtkWidget *toplevel,
+                                 GdkEvent  *event);
+
+#ifndef GTK_DISABLE_DEPRECATED
+void gtk_drag_set_default_icon (GdkColormap   *colormap,
+                               GdkPixmap     *pixmap,
+                               GdkBitmap     *mask,
+                               gint           hot_x,
+                               gint           hot_y);
+#endif /* !GTK_DISABLE_DEPRECATED */
+
+G_END_DECLS
 
 #endif /* __GTK_DND_H__ */