diff --git a/Source/NSControl.m b/Source/NSControl.m
index 325b5dac1..594bfd28d 100644
--- a/Source/NSControl.m
+++ b/Source/NSControl.m
@@ -191,6 +191,8 @@ static Class cellClass;
 
 - (void) setStringValue: (NSString *)aString
 {
+  [self abortEditing];
+  
   [[self selectedCell] setStringValue: aString];
   [self setNeedsDisplay: YES];
 }
@@ -282,7 +284,7 @@ static Class cellClass;
 
 - (void) validateEditing
 {
-}					// FIX ME
+}			
 
 /*
  * Resizing the Control
@@ -487,33 +489,6 @@ static Class cellClass;
 {
 }
 
-/*
- * Methods Implemented by the Delegate
- */
-- (BOOL) control: (NSControl *)control
-		textShouldBeginEditing: (NSText *)fieldEditor
-{
-  return NO;
-}
-
-- (BOOL) control: (NSControl *)control
-		textShouldEndEditing: (NSText *)fieldEditor
-{
-  return NO;
-}
-
-- (void) controlTextDidBeginEditing: (NSNotification *)aNotification
-{
-}
-
-- (void) controlTextDidEndEditing: (NSNotification *)aNotification
-{
-}
-
-- (void) controlTextDidChange: (NSNotification *)aNotification
-{
-}
-
 /*
  * NSCoding protocol
  */