AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 13:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Move two functions used only with OLE2_DND inside its ifdef.

Browse Source 
2004-03-15  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdnd-win32.c: Move two functions used only with
	OLE2_DND inside its ifdef.

	Merge from HEAD:

	* gdk/win32/gdkdnd-win32.c (gdk_drag_context_unref,
	local_send_drop): Set current_dest_drag to NULL when destroying
	the context, or when dropping. Fixes #120007. Thanks to Hans
	Breuer for fix.
This commit is contained in:
Tor Lillqvist 2004-03-15 16:13:52 +00:00 committed by Tor Lillqvist
parent 03e4664a1c
commit 3dab4659bf
6 changed files with 72 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2004-03-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdnd-win32.c: Move two functions used only with
OLE2_DND inside its ifdef.
Merge from HEAD:
* gdk/win32/gdkdnd-win32.c (gdk_drag_context_unref,
local_send_drop): Set current_dest_drag to NULL when destroying
the context, or when dropping. Fixes #120007. Thanks to Hans
Breuer for fix.
2003-07-17 Tor Lillqvist <tml@iki.fi>
Thanks to Gabriele Greco:

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
2004-03-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdnd-win32.c: Move two functions used only with
OLE2_DND inside its ifdef.
Merge from HEAD:
* gdk/win32/gdkdnd-win32.c (gdk_drag_context_unref,
local_send_drop): Set current_dest_drag to NULL when destroying
the context, or when dropping. Fixes #120007. Thanks to Hans
Breuer for fix.
2003-07-17 Tor Lillqvist <tml@iki.fi>
Thanks to Gabriele Greco:

12
ChangeLog.pre-2-4
View File

@ -1,3 +1,15 @@
2004-03-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdnd-win32.c: Move two functions used only with
OLE2_DND inside its ifdef.
Merge from HEAD:
* gdk/win32/gdkdnd-win32.c (gdk_drag_context_unref,
local_send_drop): Set current_dest_drag to NULL when destroying
the context, or when dropping. Fixes #120007. Thanks to Hans
Breuer for fix.
2003-07-17 Tor Lillqvist <tml@iki.fi>
Thanks to Gabriele Greco:

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
2004-03-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdnd-win32.c: Move two functions used only with
OLE2_DND inside its ifdef.
Merge from HEAD:
* gdk/win32/gdkdnd-win32.c (gdk_drag_context_unref,
local_send_drop): Set current_dest_drag to NULL when destroying
the context, or when dropping. Fixes #120007. Thanks to Hans
Breuer for fix.
2003-07-17 Tor Lillqvist <tml@iki.fi>
Thanks to Gabriele Greco:

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
2004-03-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdnd-win32.c: Move two functions used only with
OLE2_DND inside its ifdef.
Merge from HEAD:
* gdk/win32/gdkdnd-win32.c (gdk_drag_context_unref,
local_send_drop): Set current_dest_drag to NULL when destroying
the context, or when dropping. Fixes #120007. Thanks to Hans
Breuer for fix.
2003-07-17 Tor Lillqvist <tml@iki.fi>
Thanks to Gabriele Greco:

17
gdk/win32/gdkdnd-win32.c
View File

@ -156,6 +156,10 @@ gdk_drag_context_unref (GdkDragContext *context)
gdk_window_unref (context->dest_window);
contexts = g_list_remove (contexts, private);
if (context == current_dest_drag)
current_dest_drag = NULL;
g_free (private);
}
}
@ -503,7 +507,6 @@ static IDataObjectVtbl ido_vtbl = {
m_enum_d_advise
};
#endif /* OLE2_DND */
static target_drag_context *
target_context_new (void)
@ -512,15 +515,15 @@ target_context_new (void)
result = g_new0 (target_drag_context, 1);
#ifdef OLE2_DND
result->idt.lpVtbl = &idt_vtbl;
#endif
result->context = gdk_drag_context_new ();
return result;
}
#endif /* OLE2_DND */
static source_drag_context *
source_context_new (void)
{
@ -869,6 +872,8 @@ local_send_drop (GdkDragContext *context, guint32 time)
tmp_event.dnd.x_root = private->last_x;
tmp_event.dnd.y_root = private->last_y;
current_dest_drag = NULL;
gdk_event_put (&tmp_event);
}
@ -1205,12 +1210,13 @@ gdk_drop_finish (GdkDragContext *context,
}
}
#ifdef OLE2_DND
static GdkFilterReturn
gdk_destroy_filter (GdkXEvent *xev,
GdkEvent *event,
gpointer data)
{
#ifdef OLE2_DND
MSG *msg = (MSG *) xev;
if (msg->message == WM_DESTROY)
@ -1221,10 +1227,11 @@ gdk_destroy_filter (GdkXEvent *xev,
RevokeDragDrop (msg->hwnd);
CoLockObjectExternal (idtp, FALSE, TRUE);
}
#endif
return GDK_FILTER_CONTINUE;
}
#endif
void
gdk_window_register_dnd (GdkWindow *window)
{