# HG changeset patch
# User mta
# Date 989816714 0
# Node ID 8f3fb4fd879bd10df18cbbe69db350ccd496473c
# Parent  c69610198c3503a94f73cc84a3ad55777400ebda
[xemacs-hg @ 2001-05-14 05:05:09 by mta]
* dragdrop.el (experimental-dragdrop-drop-url-default): If event
has no window, use one from the frame in the event

* frame-msw.c (mswindows_make_frame_visible): Call SetActiveWindow
to make the frame the active window.

diff -r c69610198c35 -r 8f3fb4fd879b lisp/ChangeLog
--- a/lisp/ChangeLog	Mon May 14 04:52:49 2001 +0000
+++ b/lisp/ChangeLog	Mon May 14 05:05:14 2001 +0000
@@ -1,3 +1,8 @@
+2001-05-13  Mike Alexander  <mta@arbortext.com>
+
+	* dragdrop.el (experimental-dragdrop-drop-url-default): If event
+	has no window, use one from the frame in the event
+
 2001-05-12  Ben Wing  <ben@xemacs.org>
 
 	* .cvsignore: auto-autoloads/custom-load need to be added now that they're not in cvs.
diff -r c69610198c35 -r 8f3fb4fd879b lisp/dragdrop.el
--- a/lisp/dragdrop.el	Mon May 14 04:52:49 2001 +0000
+++ b/lisp/dragdrop.el	Mon May 14 05:05:14 2001 +0000
@@ -229,10 +229,12 @@
   "*{EXPERIMENTAL} Default handler for dropped URL data.
 Finds files and URLs. Returns nil if object does not contain URL data."
   (cond ((eq (car object) 'dragdrop-URL)
-	 (let ((data (cdr object))
-	       (frame (event-channel event))
-	       (x pop-up-windows)
-	       (window (event-window event)))
+	 (let* ((data (cdr object))
+		(frame (event-channel event))
+		(x pop-up-windows)
+		(window (or (event-window event)
+			    (frame-selected-window frame)
+			    (frame-highest-window frame 0))))
 	   (setq pop-up-windows nil)
 	   (while (not (eq data ()))
 	     (cond ((dragdrop-is-some-url "file" (car data))
diff -r c69610198c35 -r 8f3fb4fd879b src/ChangeLog
--- a/src/ChangeLog	Mon May 14 04:52:49 2001 +0000
+++ b/src/ChangeLog	Mon May 14 05:05:14 2001 +0000
@@ -1,3 +1,8 @@
+2001-05-13  Mike Alexander  <mta@arbortext.com>
+
+	* frame-msw.c (mswindows_make_frame_visible): Call SetActiveWindow
+	to make the frame the active window.
+
 2001-05-11  Martin Buchholz  <martin@xemacs.org>
 
 	Eliminate the need to define HAVE_PTYS in s&m files.
diff -r c69610198c35 -r 8f3fb4fd879b src/frame-msw.c
--- a/src/frame-msw.c	Mon May 14 04:52:49 2001 +0000
+++ b/src/frame-msw.c	Mon May 14 05:05:14 2001 +0000
@@ -339,6 +339,7 @@
     ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_RESTORE);
   else
     ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_SHOW);
+  SetActiveWindow (FRAME_MSWINDOWS_HANDLE(f));
   f->visible = 1;
   f->iconified = 0;
 }