Index: dojo-release-1.3.2-src/dojox/grid/DataSelection.js
===================================================================
--- dojo-release-1.3.2-src.orig/dojox/grid/DataSelection.js
+++ dojo-release-1.3.2-src/dojox/grid/DataSelection.js
@@ -19,10 +19,8 @@ dojo.declare("dojox.grid.DataSelection",
 
 	getSelected: function(){
 		var result = [];
-		for(var i=0, l=this.selected.length; i<l; i++){
-			if(this.selected[i]){
-				result.push(this.grid.getItem(i));
-			}
+		for(var id in this.selected){
+			result.push(this.selected[id]);
 		}
 		return result;
 	},
Index: dojo-release-1.3.2-src/dojox/grid/Selection.js
===================================================================
--- dojo-release-1.3.2-src.orig/dojox/grid/Selection.js
+++ dojo-release-1.3.2-src/dojox/grid/Selection.js
@@ -7,7 +7,7 @@ dojo.declare("dojox.grid.Selection", nul
 
 	constructor: function(inGrid){
 		this.grid = inGrid;
-		this.selected = [];
+		this.selected = {};
 
 		this.setMode(inGrid.selectionMode);
 	},
@@ -16,11 +16,12 @@ dojo.declare("dojox.grid.Selection", nul
 
 	selected: null,
 	updating: 0,
-	selectedIndex: -1,
+	selectedId: null,
 
 	setMode: function(mode){
-		if(this.selected.length){
+		for(var id in this.selected){
 			this.deselectAll();
+			break;
 		}
 		if(mode != 'extended' && mode != 'multiple' && mode != 'single' && mode != 'none'){
 			this.mode = 'extended';
@@ -54,24 +55,32 @@ dojo.declare("dojox.grid.Selection", nul
 		if(this.mode == 'none'){
 			return false;
 		}
-		return this.selected[inIndex];
+		var item = this.grid.getItem(inIndex);
+		return item && this.grid.store.getIdentity(item) in this.selected;
 	},
 
 	getFirstSelected: function(){
-		if(!this.selected.length||this.mode == 'none'){ return -1; }
-		for(var i=0, l=this.selected.length; i<l; i++){
-			if(this.selected[i]){
-				return i;
+		dojo.deprecated("Selection::getSelected is deprecated.", "", "2.0");
+		if(this.mode == 'none'){ return -1; }
+		for(var id in this.selected){
+			if(this.selected[id]){
+				return this.grid.getItemIndex(this.seleced[id]);
 			}
 		}
 		return -1;
 	},
 
 	getNextSelected: function(inPrev){
+		dojo.deprecated("Selection::getNextSelected is deprecated.", "", "2.0");
 		if(this.mode == 'none'){ return -1; }
-		for(var i=inPrev+1, l=this.selected.length; i<l; i++){
-			if(this.selected[i]){
-				return i;
+		var found = false;
+		var item = this.grid.getItem(inPrev);
+		for(var id in this.selected){
+			if(found){
+				return this.grid.getItemIndex(this.seleced[id]);
+			}
+			if(id == this.grid.store.getIdentity(item)){
+				found = true;
 			}
 		}
 		return -1;
@@ -79,20 +88,16 @@ dojo.declare("dojox.grid.Selection", nul
 
 	getSelected: function(){
 		var result = [];
-		for(var i=0, l=this.selected.length; i<l; i++){
-			if(this.selected[i]){
-				result.push(i);
-			}
+		for(var id in this.selected){
+			result.push(this.grid.getItemIndex(this.selected[id]));
 		}
 		return result;
 	},
 
 	getSelectedCount: function(){
 		var c = 0;
-		for(var i=0; i<this.selected.length; i++){
-			if(this.selected[i]){
-				c++;
-			}
+		for(var id in this.selected){
+			c++;
 		}
 		return c;
 	},
@@ -124,33 +129,48 @@ dojo.declare("dojox.grid.Selection", nul
 	addToSelection: function(inIndex){
 		if(this.mode == 'none'){ return; }
 		inIndex = Number(inIndex);
-		if(this.selected[inIndex]){
-			this.selectedIndex = inIndex;
-		}else{
-			if(this.onCanSelect(inIndex) !== false){
-				this.selectedIndex = inIndex;
-				this._beginUpdate();
-				this.selected[inIndex] = true;
-				//this.grid.onSelected(inIndex);
-				this.onSelected(inIndex);
-				//this.onSetSelected(inIndex, true);
-				this._endUpdate();
-			}
+		if(this.onCanSelect(inIndex) === false){
+			return;
 		}
+		var item = this.grid.getItem(inIndex);
+		if(item === null){
+			return;
+		}
+		var id = this.grid.store.getIdentity(item);
+		this.selectedId = id;
+		if(!(id in this.selected)){
+			this._beginUpdate();
+			this.selected[id] = item;
+			//this.grid.onSelected(inIndex);
+			this.onSelected(inIndex);
+			//this.onSetSelected(inIndex, true);
+			this._endUpdate();
+		}
+	},
+
+	_identityToIndex: function(id){
+		if(id === null){
+			return -1;
+		}
+		// cheat here to get the item by identity, as store.fetchItemByIdentity is asynchronous
+		var item = this.grid._by_idty[id].item;
+		return this.grid.getItemIndex(item);
 	},
 
 	deselect: function(inIndex){
 		if(this.mode == 'none'){ return; }
 		inIndex = Number(inIndex);
-		if(this.selectedIndex == inIndex){
-			this.selectedIndex = -1;
+		var item = this.grid.getItem(inIndex);
+		var id = this.grid.store.getIdentity(item);
+		if(inIndex == this._identityToIndex(this.selectedId)){
+			this.selectedId = null;
 		}
-		if(this.selected[inIndex]){
+		if(id in this.selected){
 			if(this.onCanDeselect(inIndex) === false){
 				return;
 			}
 			this._beginUpdate();
-			delete this.selected[inIndex];
+			delete this.selected[id];
 			//this.grid.onDeselected(inIndex);
 			this.onDeselected(inIndex);
 			//this.onSetSelected(inIndex, false);
@@ -186,22 +206,21 @@ dojo.declare("dojox.grid.Selection", nul
 	},
 
 	insert: function(inIndex){
-		this.selected.splice(inIndex, 0, false);
-		if(this.selectedIndex >= inIndex){
-			this.selectedIndex++;
-		}
+		var item = this.grid.getItem(inItem);
+		var id = this.grid.store.getIdentity(item);
+		this.selected[id] = item;
 	},
 
 	remove: function(inIndex){
-		this.selected.splice(inIndex, 1);
-		if(this.selectedIndex >= inIndex){
-			this.selectedIndex--;
-		}
+		var item = this.grid.getItem(inItem);
+		var id = this.grid.store.getIdentity(item);
+		delete this.selected[id];
 	},
 
 	deselectAll: function(inExcept){
-		for(var i in this.selected){
-			if((i!=inExcept)&&(this.selected[i]===true)){
+		for(var id in this.selected){
+			var i = this.grid.getItemIndex(this.selected[id]);
+			if(i!=inExcept){
 				this.deselect(i);
 			}
 		}
@@ -213,7 +232,7 @@ dojo.declare("dojox.grid.Selection", nul
 		if(this.mode != 'extended'){
 			this.select(inIndex);
 		}else{
-			var lastSelected = this.selectedIndex;
+			var lastSelected = this._identityToIndex(this.selectedId);
 			if(!inCtrlKey){
 				this.deselectAll(inIndex);
 			}