--- a/AbstractFileBrowser.st	Tue Jul 05 17:53:56 2005 +0200
+++ b/AbstractFileBrowser.st	Wed Jul 06 10:02:00 2005 +0200
@@ -645,19 +645,65 @@
 
 !AbstractFileBrowser class methodsFor:'image'!
 
+disabledCursorIcon
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self disabledCursorImage inspect
+     ImageEditor openOnClass:self andSelector:#disabledCursorImage
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:#'AbstractFileBrowser class disabledCursorImage'
+        ifAbsentPut:[(Depth1Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@_ @@@XF@@@H@P@@DOB@@BLLP@AA@"@@RHD @H1AD@BRHI@@$QBP@IBH$@BPQI@@"BLP@D QH@ADBB@@H0Q@@AC
+8 @@H@P@@A X@@@G8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@_ @@@_>@@@O?0@@G?>@@C<O0@A?@>@@_8G @O?A<@C38O@@<_C0@OC8<@C0_O@@>C?0@G _8@A<C>@@O0_@@A?
+? @@O?0@@A?8@@@G8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
 disabledCursorImage
-
-    DisabledCursorImage isNil ifTrue:[
-        DisabledCursorImage := Image fromFile:'xpmBitmaps/cursors/no_entry.xpm'
-    ].
+"/    DisabledCursorImage isNil ifTrue:[
+"/        DisabledCursorImage := self disabledCursorIcon. "/ Image fromFile:'xpmBitmaps/cursors/no_entry.xpm'
+"/    ].
     ^ DisabledCursorImage
 !
 
+enabledCursorIcon
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self enabledCursorImage inspect
+     ImageEditor openOnClass:self andSelector:#enabledCursorImage
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:#'AbstractFileBrowser class enabledCursorImage'
+        ifAbsentPut:[(Depth1Image new) width: 32; height: 32; photometric:(#palette); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@E@@@@AP@@@@T@@@@E@@@@AP@@@@T@@@@E@@@@AP@@@@@@@@?0_0@@@@@@C?A?@@@@@@@@AP@@@@T@@@@E@@@@A
+P@@@@T@@@@E@@@@AP@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((ImageMask new) width: 32; height: 32; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@G@@@@A0@@@@\@@@@G@@@@A0@@@@\@@@@G@@@@A0@@@@\@@@?8?0@O>O<@C?#?@@@G@@@@A0@@@@\@@@@G@@@@A
+0@@@@\@@@@G@@@@A0@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; yourself); yourself]
+!
+
 enabledCursorImage
-
-    EnabledCursorImage isNil ifTrue:[
-        EnabledCursorImage := Image fromFile:'xpmBitmaps/cursors/double_crossHair.xpm'
-    ].
+"/    EnabledCursorImage isNil ifTrue:[
+"/        EnabledCursorImage := self enabledCursorIcon. "/ Image fromFile:'xpmBitmaps/cursors/double_crossHair.xpm'
+"/    ].
     ^ EnabledCursorImage
 ! !
 
@@ -6733,5 +6779,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.296 2005-07-05 10:15:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.297 2005-07-06 08:02:00 cg Exp $'
 ! !

--- a/DirectoryTreeBrowser.st	Tue Jul 05 17:53:56 2005 +0200
+++ b/DirectoryTreeBrowser.st	Wed Jul 06 10:02:00 2005 +0200
@@ -924,12 +924,12 @@
         anItem isDirectory ifTrue:[
             anItem makeIconGray:true.
             anItem changed:#icon.
-            (anItem notNil and:[anItem isDirectory and:[anItem fileName isWritable]]) ifTrue:[
-                expandItemTimedBlock := [
-                        self expandForDrop:anItem with:aDropContext.    
-                ].
-                Processor addTimedBlock:expandItemTimedBlock
-                    afterMilliseconds:(self class timeForExpandOnDropInMilliseconds).
+            (anItem notNil and:[anItem isDirectory and:[anItem isWritable]]) ifTrue:[
+                self 
+                    setupAutoExpandItemTimedBlock:
+                        [
+                            self expandForDrop:anItem with:aDropContext.    
+                        ].
             ]
         ].
     ].
@@ -972,11 +972,19 @@
 !
 
 removeExpandItemTimedBlock
+    |b|
 
-    expandItemTimedBlock notNil ifTrue:[
-        Processor removeTimedBlock:expandItemTimedBlock.
-        expandItemTimedBlock := nil
+    (b := expandItemTimedBlock) notNil ifTrue:[
+        expandItemTimedBlock := nil.
+        Processor removeTimedBlock:b.
     ]
+!
+
+setupAutoExpandItemTimedBlock:aBlock
+    expandItemTimedBlock := aBlock.
+    Processor 
+        addTimedBlock:expandItemTimedBlock
+        afterMilliseconds:(self class timeForExpandOnDropInMilliseconds).
 ! !
 
 !DirectoryTreeBrowser methodsFor:'event handling'!
@@ -1318,5 +1326,5 @@
 !DirectoryTreeBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.94 2005-04-14 09:13:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.95 2005-07-06 08:01:30 cg Exp $'
 ! !