diff --git a/ChangeLog b/ChangeLog
index 5a99b67e4..49196c814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-03  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSWindow.m: Implement 
+	([-dragImage:at:offset:event:pasteboard:source:slideBack:]) by calling
+	the mothod of the smae name in the window view.
+
 1999-07-03  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSApplication.m (-run): Added destroyContext (so we can
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 38b2e5b95..5a2ecb650 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -1457,14 +1457,26 @@ static Class	responderClass;
 /*
  * Dragging
  */
-- (void) dragImage: (NSImage *)anImage
-	       at: (NSPoint)baseLocation
-	       offset: (NSSize)initialOffset
-	       event: (NSEvent *)event
-	       pasteboard: (NSPasteboard *)pboard
-	       source: sourceObject
-	       slideBack: (BOOL)slideFlag
+- (void) dragImage: (NSImage*)anImage
+	        at: (NSPoint)baseLocation
+	    offset: (NSSize)initialOffset
+	     event: (NSEvent*)event
+        pasteboard: (NSPasteboard*)pboard
+	    source: (id)sourceObject
+	 slideBack: (BOOL)slideFlag
 {
+  /*
+   * Ensure we have a content view and it's associated window view.
+   */
+  if (content_view == nil)
+    [self setContentView: nil];
+  [[content_view superview] dragImage: anImage
+				   at: baseLocation
+			       offset: initialOffset
+			        event: event
+			   pasteboard: pboard
+			       source: sourceObject
+			    slideBack: slideFlag];
 }
 
 - (void) registerForDraggedTypes: (NSArray*)newTypes