hg/stx-libview: comparison XWorkstation.st

equal deleted inserted replaced

-:6093fded5ed1
+:32467c3ce97d
 free(cp);
 }
 }
 fail: ;
 %}.
-typeID isNil ifTrue:[
+(typeID isNil or:[typeID == 0]) ifTrue:[
+"typeID == 0 (None): The property does not exist in the specified window"
 ^ nil
 ].
 ^ typeID->val
 "
 !
 selectionNotify:aView selection:aSelectionID target:aTargetID property:aPropertyID requestor:requestorID time:time
 "this is a forwarded selectionNotify event from XWorkstation"
-|property propertyKey|
+|property propertyKey atomName|
 aSelectionID ~~ selectionID ifTrue:[
 "ignore notification that is not for our selection"
 ^ self.
 ].
 done := true.
 ^ self.
 ].
 property := display getProperty:aPropertyID from:drawableID delete:true.
+property isNil ifTrue:[
+"the property does not exist in the specified window"
+done := true.
+^ self
+].
 propertyKey := property key.
 propertyKey == aTargetID ifTrue:[
 "good, the property is consistent with our request.
 The whole selection is in the property"
 buffer := property value.
 done := true.
 ] ifFalse:[propertyKey == (display atomIDOf:#INCR) ifTrue:[
 "this is an incremental transfer. Wait for property change"
 incremental := true.
 ] ifFalse:[
+atomName := (display atomName:propertyKey) ? propertyKey.
 'XWorkstation(error): unexpected targetID (' errorPrint.
-(display atomName:propertyKey) errorPrint.
+atomName errorPrint.
-')in selectionNotify: ' errorPrint.
+') in selectionNotify: ' errorPrint.
 display errorPrintCR.
 done := true.
 ]].
 ! !
 ! !
 !XWorkstation class methodsFor:'documentation'!
 version_CVS
-^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.545 2012-10-08 07:43:32 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.546 2012-10-22 17:20:54 stefan Exp $'
 !
 version_SVN
 ^ '� Id �'
 ! !

changeset 5936	32467c3ce97d
parent 5934	456535dcca66
child 5938	f5d6189257d4