From 7437f0325133123acaaabd844be3d1f2701418df Mon Sep 17 00:00:00 2001
From: rowanbeentje <rowan@beent.je>
Date: Sat, 18 Sep 2010 18:01:20 +0000
Subject:  - Remove a number of invalid [NSTableView makeFirstResponder] calls
 that had crept into the source, replacing with the correct [NSWindow
 makeFirstResponder:NSTableView].  This fixes a number of exceptions.  -
 Update localisable strings.

---
 Source/SPCopyTable.m             | 4 ++--
 Source/SPCustomQuery.m           | 4 ++--
 Source/SPFieldMapperController.m | 6 +++---
 Source/SPTableContent.m          | 4 ++--
 Source/SPTableStructure.m        | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'Source')

diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m
index faf1b231..8c6f6525 100644
--- a/Source/SPCopyTable.m
+++ b/Source/SPCopyTable.m
@@ -120,7 +120,7 @@ NSInteger MENU_EDIT_COPY_AS_SQL      = 2003;
 		if ( [self numberOfColumns] - 1 == column) {
 			if([[self delegate] respondsToSelector:@selector(addRowToDB)])
 				[[self delegate] addRowToDB];
-			[self makeFirstResponder];
+			[[self window] makeFirstResponder:self];
 		} else {
 			// Select the next field for editing
 			[self editColumn:column+1 row:row withEvent:nil select:YES];
@@ -138,7 +138,7 @@ NSInteger MENU_EDIT_COPY_AS_SQL      = 2003;
 		if ( column < 1 ) {
 			if([[self delegate] respondsToSelector:@selector(addRowToDB)])
 				[[self delegate] addRowToDB];
-			[self makeFirstResponder];
+			[[self window] makeFirstResponder:self];
 		} else {
 			// Select the previous field for editing
 			[self editColumn:column-1 row:row withEvent:nil select:YES];
diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index ae1b01c0..35401d97 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -2296,7 +2296,7 @@
 			if ( editData ) [editData release];
 
 			// Preserve focus and restore selection indexes if appropriate
-			[customQueryView makeFirstResponder];
+			[[tableDocumentInstance parentWindow] makeFirstResponder:customQueryView]; 
 			if (selectionIndexToRestore)
 				[customQueryView selectRowIndexes:selectionIndexToRestore byExtendingSelection:NO];
 
@@ -3607,7 +3607,7 @@
 			[control abortEditing];
 
 			// Preserve the focus
-			[customQueryView makeFirstResponder];
+			[[tableDocumentInstance parentWindow] makeFirstResponder:customQueryView]; 
 
 			return TRUE;
 		}
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 6adbcf46..ccb6d616 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -1820,7 +1820,7 @@
 
 		// Save the current line if it's the last field in the table
 		if ( [fieldMapperTableView numberOfColumns] - 1 == column) {
-			[fieldMapperTableView makeFirstResponder];
+			[[fieldMapperTableView window] makeFirstResponder:fieldMapperTableView];
 		} else {
 			// Select the next field for editing
 			[fieldMapperTableView editColumn:column+1 row:row withEvent:nil select:YES];
@@ -1836,7 +1836,7 @@
 
 		// Save the current line if it's the last field in the table
 		if ( column < 1 ) {
-			[fieldMapperTableView makeFirstResponder];
+			[[fieldMapperTableView window] makeFirstResponder:fieldMapperTableView];
 		} else {
 			// Select the previous field for editing
 			[fieldMapperTableView editColumn:column-1 row:row withEvent:nil select:YES];
@@ -1908,7 +1908,7 @@
 		[control abortEditing];
 
 		// Preserve the focus
-		[fieldMapperTableView makeFirstResponder];
+		[[fieldMapperTableView window] makeFirstResponder:fieldMapperTableView];
 
 		return TRUE;
 	}
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m
index cff8a675..87526837 100644
--- a/Source/SPTableContent.m
+++ b/Source/SPTableContent.m
@@ -2468,7 +2468,7 @@
 	isEditingRow = NO;
 	currentlyEditingRow = -1;
 	[tableContentView reloadData];
-	[tableContentView makeFirstResponder];
+	[[tableDocumentInstance parentWindow] makeFirstResponder:tableContentView];
 	return YES;
 }
 
@@ -3585,7 +3585,7 @@
 
 			if (editData) [editData release];
 
-			[tableContentView makeFirstResponder];
+			[[tableDocumentInstance parentWindow] makeFirstResponder:tableContentView];
 
 			return NO;
 		}
diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index a5aa45af..a0e80306 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -629,7 +629,7 @@
 	isEditingRow = NO;
 	[tableSourceView reloadData];
 	currentlyEditingRow = -1;
-	[tableSourceView makeFirstResponder];
+	[[tableDocumentInstance parentWindow] makeFirstResponder:tableSourceView];
 	return YES;
 }
 
@@ -1710,7 +1710,7 @@ would result in a position change.
 		[[control window] makeFirstResponder:control];
 		[self addRowToDB];
 		[tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
-		[tableSourceView makeFirstResponder];
+		[[tableDocumentInstance parentWindow] makeFirstResponder:tableSourceView];
 		return YES;
 	
 	}
@@ -1913,7 +1913,7 @@ would result in a position change.
 	[tableDocumentInstance endTask];
 
 	// Preserve focus on table for keyboard navigation
-	[tableSourceView makeFirstResponder];
+	[[tableDocumentInstance parentWindow] makeFirstResponder:tableSourceView];
 
 	[pool drain];
 }
-- 
cgit v1.2.3