--- a/DropObject.st	Thu Dec 09 12:13:52 1999 +0100
+++ b/DropObject.st	Thu Dec 09 12:15:01 1999 +0100
@@ -28,6 +28,13 @@
 "
 !
 
+DropObject subclass:#File
+	instanceVariableNames:'info isHtmlFile isImageFile isPrintable'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:DropObject
+!
+
 DropObject subclass:#Text
 	instanceVariableNames:''
 	classVariableNames:''
@@ -49,13 +56,6 @@
 	privateIn:DropObject
 !
 
-DropObject subclass:#File
-	instanceVariableNames:'info isHtmlFile isImageFile isPrintable'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:DropObject
-!
-
 !DropObject class methodsFor:'documentation'!
 
 copyright
@@ -156,7 +156,7 @@
     DisplayObject notNil ifTrue:[
         ^ DisplayObject
     ].
-    DisplayObject := Smalltalk bitmapFromFileNamed:(self displayObjectName) forClass:self.
+    DisplayObject := Smalltalk imageFromFileNamed:(self displayObjectName) forClass:self.
     ^ DisplayObject
 
     "Modified: 19.4.1997 / 13:04:05 / cg"
@@ -250,66 +250,6 @@
     "Modified: 19.4.1997 / 12:52:17 / cg"
 ! !
 
-!DropObject::Text class methodsFor:'defaults'!
-
-displayObjectName
-    ^ 'bitmaps/xpmBitmaps/document_images/yellow_file_text_grab.xpm'
-
-    "Modified: 19.4.1997 / 15:40:33 / cg"
-! !
-
-!DropObject::Text methodsFor:'testing'!
-
-isTextObject
-    "return true, if the dropObject represents some text"
-
-    ^ true
-
-    "Modified: 19.4.1997 / 12:52:08 / cg"
-! !
-
-!DropObject::Color class methodsFor:'defaults'!
-
-displayObjectName
-    "return the name of a bitmap image file, which is used 
-     during a drag."
-
-    ^ 'bitmaps/xpmBitmaps/misc_tools/color_wheel.xpm'
-
-    "Modified: 19.4.1997 / 15:38:12 / cg"
-! !
-
-!DropObject::Color methodsFor:'testing'!
-
-isColorObject
-    "return true, if the dropObject represents a color"
-
-    ^ true
-
-    "Modified: 19.4.1997 / 12:51:57 / cg"
-! !
-
-!DropObject::Image class methodsFor:'defaults'!
-
-displayObjectName
-    "return the name of a bitmap image file, which is used 
-     during a drag."
-
-    ^ 'bitmaps/xpmBitmaps/misc_tools/picture.xpm'
-
-    "Modified: 19.4.1997 / 15:38:02 / cg"
-! !
-
-!DropObject::Image methodsFor:'testing'!
-
-isImageObject
-    "return true, if the dropObject represents an image"
-
-    ^ true
-
-    "Modified: 19.4.1997 / 12:51:28 / cg"
-! !
-
 !DropObject::File class methodsFor:'defaults'!
 
 displayObjectName
@@ -425,8 +365,68 @@
     "Modified: 19.4.1997 / 12:51:49 / cg"
 ! !
 
+!DropObject::Text class methodsFor:'defaults'!
+
+displayObjectName
+    ^ 'bitmaps/xpmBitmaps/document_images/yellow_file_text_grab.xpm'
+
+    "Modified: 19.4.1997 / 15:40:33 / cg"
+! !
+
+!DropObject::Text methodsFor:'testing'!
+
+isTextObject
+    "return true, if the dropObject represents some text"
+
+    ^ true
+
+    "Modified: 19.4.1997 / 12:52:08 / cg"
+! !
+
+!DropObject::Color class methodsFor:'defaults'!
+
+displayObjectName
+    "return the name of a bitmap image file, which is used 
+     during a drag."
+
+    ^ 'bitmaps/xpmBitmaps/misc_tools/color_wheel.xpm'
+
+    "Modified: 19.4.1997 / 15:38:12 / cg"
+! !
+
+!DropObject::Color methodsFor:'testing'!
+
+isColorObject
+    "return true, if the dropObject represents a color"
+
+    ^ true
+
+    "Modified: 19.4.1997 / 12:51:57 / cg"
+! !
+
+!DropObject::Image class methodsFor:'defaults'!
+
+displayObjectName
+    "return the name of a bitmap image file, which is used 
+     during a drag."
+
+    ^ 'bitmaps/xpmBitmaps/misc_tools/picture.xpm'
+
+    "Modified: 19.4.1997 / 15:38:02 / cg"
+! !
+
+!DropObject::Image methodsFor:'testing'!
+
+isImageObject
+    "return true, if the dropObject represents an image"
+
+    ^ true
+
+    "Modified: 19.4.1997 / 12:51:28 / cg"
+! !
+
 !DropObject class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/DropObject.st,v 1.9 1999-12-01 20:17:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/DropObject.st,v 1.10 1999-12-09 11:15:01 cg Exp $'
 ! !