diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-10-22 04:34:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-10-22 04:34:42 +0000 |
| commit | 46dde8042854304a12db1e687df00300d517d9e6 (patch) | |
| tree | d8d950524745bcdd4e4fcb87ecfc66e16cd370c7 /gtk/gtkdnd.c | |
| parent | 724a552c7d00889bcc64127e8921cd11d3eb6ec4 (diff) | |
| download | gdk-pixbuf-46dde8042854304a12db1e687df00300d517d9e6.tar.gz | |
Fix problem with g_return_if_fail return value.
Sun Oct 21 23:27:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
problem with g_return_if_fail return value.
* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
virtual atom code from the gdk-multihead branch, removing the per-display
part. Virtualizing atoms needs to be done now to prevent compat
breakage in direct Xlib accessing code in the future. (#62208)
* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().
* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
an opaque pointer type so the compiler catches attempts
to mingle it with X atoms.
* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
tests/testdnd.c,tests/testselection.c:
Fix up for above atom changes.
* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
now have the ability to add custom predefines.
* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
to gtk_clipboard_get().
* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
for GdkAtom => pointer change.
* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
atoms, fix for GdkAtom => pointer change.
Diffstat (limited to 'gtk/gtkdnd.c')
| -rw-r--r-- | gtk/gtkdnd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 78210ecf1..bebb9b49a 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1353,7 +1353,7 @@ gtk_drag_proxy_begin (GtkWidget *widget, while (tmp_list) { gtk_target_list_add (source_info->target_list, - GPOINTER_TO_UINT (tmp_list->data), 0, 0); + GDK_POINTER_TO_ATOM (tmp_list->data), 0, 0); tmp_list = tmp_list->next; } @@ -2446,7 +2446,7 @@ gtk_drag_source_check_selection (GtkDragSourceInfo *info, tmp_list = info->selections; while (tmp_list) { - if (GPOINTER_TO_UINT (tmp_list->data) == selection) + if (GDK_POINTER_TO_ATOM (tmp_list->data) == selection) return; tmp_list = tmp_list->next; } @@ -2546,7 +2546,7 @@ gtk_drag_source_release_selections (GtkDragSourceInfo *info, GList *tmp_list = info->selections; while (tmp_list) { - GdkAtom selection = GPOINTER_TO_UINT (tmp_list->data); + GdkAtom selection = GDK_POINTER_TO_ATOM (tmp_list->data); if (gdk_selection_owner_get (selection) == info->ipc_widget->window) gtk_selection_owner_set (NULL, selection, time); tmp_list = tmp_list->next; |