diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | gdk/gdkdnd.h | 8 | ||||
| -rw-r--r-- | gdk/gdkdraw.c | 4 | ||||
| -rw-r--r-- | gdk/gdkdrawable.h | 2 |
10 files changed, 64 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2000-04-15 Havoc Pennington <hp@pobox.com> + + * gdk/gdkdnd.h: clean up enum format, remove extra comma, + this keeps scanner scripts from getting confused. + + * gdk/gdkdraw.c (gdk_drawable_get_data): This should return the + data, rather than void + 2000-04-15 Tor Lillqvist <tml@iki.fi> * gtk/gtkclist.c (gtk_clist_motion) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 32cac4d777..bbb60861eb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2000-04-15 Havoc Pennington <hp@pobox.com> + + * gdk/gdkdnd.h: clean up enum format, remove extra comma, + this keeps scanner scripts from getting confused. + + * gdk/gdkdraw.c (gdk_drawable_get_data): This should return the + data, rather than void + 2000-04-15 Tor Lillqvist <tml@iki.fi> * gtk/gtkclist.c (gtk_clist_motion) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 32cac4d777..bbb60861eb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2000-04-15 Havoc Pennington <hp@pobox.com> + + * gdk/gdkdnd.h: clean up enum format, remove extra comma, + this keeps scanner scripts from getting confused. + + * gdk/gdkdraw.c (gdk_drawable_get_data): This should return the + data, rather than void + 2000-04-15 Tor Lillqvist <tml@iki.fi> * gtk/gtkclist.c (gtk_clist_motion) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 32cac4d777..bbb60861eb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2000-04-15 Havoc Pennington <hp@pobox.com> + + * gdk/gdkdnd.h: clean up enum format, remove extra comma, + this keeps scanner scripts from getting confused. + + * gdk/gdkdraw.c (gdk_drawable_get_data): This should return the + data, rather than void + 2000-04-15 Tor Lillqvist <tml@iki.fi> * gtk/gtkclist.c (gtk_clist_motion) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 32cac4d777..bbb60861eb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2000-04-15 Havoc Pennington <hp@pobox.com> + + * gdk/gdkdnd.h: clean up enum format, remove extra comma, + this keeps scanner scripts from getting confused. + + * gdk/gdkdraw.c (gdk_drawable_get_data): This should return the + data, rather than void + 2000-04-15 Tor Lillqvist <tml@iki.fi> * gtk/gtkclist.c (gtk_clist_motion) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 32cac4d777..bbb60861eb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2000-04-15 Havoc Pennington <hp@pobox.com> + + * gdk/gdkdnd.h: clean up enum format, remove extra comma, + this keeps scanner scripts from getting confused. + + * gdk/gdkdraw.c (gdk_drawable_get_data): This should return the + data, rather than void + 2000-04-15 Tor Lillqvist <tml@iki.fi> * gtk/gtkclist.c (gtk_clist_motion) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 32cac4d777..bbb60861eb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2000-04-15 Havoc Pennington <hp@pobox.com> + + * gdk/gdkdnd.h: clean up enum format, remove extra comma, + this keeps scanner scripts from getting confused. + + * gdk/gdkdraw.c (gdk_drawable_get_data): This should return the + data, rather than void + 2000-04-15 Tor Lillqvist <tml@iki.fi> * gtk/gtkclist.c (gtk_clist_motion) diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index 3d5e802e9b..916bd2e8e0 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -9,7 +9,8 @@ extern "C" { typedef struct _GdkDragContext GdkDragContext; -typedef enum { +typedef enum +{ GDK_ACTION_DEFAULT = 1 << 0, GDK_ACTION_COPY = 1 << 1, GDK_ACTION_MOVE = 1 << 2, @@ -18,14 +19,15 @@ typedef enum { GDK_ACTION_ASK = 1 << 5 } GdkDragAction; -typedef enum { +typedef enum +{ GDK_DRAG_PROTO_MOTIF, GDK_DRAG_PROTO_XDND, GDK_DRAG_PROTO_ROOTWIN, /* A root window with nobody claiming * drags */ GDK_DRAG_PROTO_NONE, /* Not a valid drag window */ GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */ - GDK_DRAG_PROTO_OLE2, /* The complex OLE2 dnd (not implemented) */ + GDK_DRAG_PROTO_OLE2 /* The complex OLE2 dnd (not implemented) */ } GdkDragProtocol; /* Structure that holds information about a drag in progress. diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index baec9d62d1..03517f48a0 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -63,11 +63,11 @@ gdk_drawable_set_data (GdkDrawable *drawable, g_dataset_set_data_full (drawable, key, data, destroy_func); } -void +gpointer gdk_drawable_get_data (GdkDrawable *drawable, const gchar *key) { - g_dataset_get_data (drawable, key); + return g_dataset_get_data (drawable, key); } GdkDrawableType diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index 3b05d24a27..a1c5fd3f2b 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -120,7 +120,7 @@ void gdk_drawable_set_data (GdkDrawable *drawable, const gchar *key, gpointer data, GDestroyNotify destroy_func); -void gdk_drawable_get_data (GdkDrawable *drawable, +gpointer gdk_drawable_get_data (GdkDrawable *drawable, const gchar *key); void gdk_drawable_get_size (GdkWindow *drawable, |