Fixes, etc.

EditPaneLayoutManager.h

@@ -13,7 +13,7 @@
 	NSFont *font;
 }
 
-@property (nonatomic, retain) NSFont *font;
+@property (nonatomic, strong) NSFont *font;
 
 - (CGFloat)lineHeight;
 

EditPaneLayoutManager.m

@@ -18,16 +18,11 @@ - (id)init {
 	if ((self = [super init])) {
 		EditPaneTypesetter *typeSetter = [[EditPaneTypesetter alloc] init];
 		[self setTypesetter:typeSetter];
-		[typeSetter release];
 		[self setUsesFontLeading:NO];
 	}
 	return self;
 }
 
-- (void)dealloc {
-	self.font = nil;
-	[super dealloc];
-}
 
 - (CGFloat)lineHeight {
 	return floor([self defaultLineHeightForFont:font] + 1.5);

EditPaneTextView.m

@@ -12,7 +12,7 @@
 #import "PreferencesController.h"
 
 NSString * const	kEditPaneTextViewChangedNotification		= @"EditPaneTextViewChangedNotification";
-NSString * const	kEditPaneColorChangedNotification			= @"EditPaneColorChangedNotification";
+void *kEditPaneColorChangedNotification = &kEditPaneColorChangedNotification;
 
 @implementation EditPaneTextView
 
@@ -43,20 +43,29 @@ - (void)awakeFromNib {
 
 	[self setUsesFontPanel:NO];
 
-	NSTextContainer *textContainer = [[NSTextContainer alloc] init];
-	[textContainer setContainerSize:[[self textContainer] containerSize]];
+	NSTextContainer *textContainer = [self textContainer];
 	[textContainer setWidthTracksTextView:YES];
 	layoutMan = [[EditPaneLayoutManager alloc] init];
-	[self replaceTextContainer:textContainer];
 	[textContainer replaceLayoutManager:layoutMan];
-	[textContainer release];
 }
 
 - (void)dealloc {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
-	[[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self];
-	[layoutMan release];
-	[super dealloc];
+
+	NSUserDefaultsController *defaultsController = [NSUserDefaultsController sharedUserDefaultsController];
+
+	[defaultsController removeObserver:self
+							forKeyPath:[NSString stringWithFormat:@"values.%@", kEditPaneForegroundColor]
+							   context:kEditPaneColorChangedNotification];
+	[defaultsController removeObserver:self
+							forKeyPath:[NSString stringWithFormat:@"values.%@", kEditPaneBackgroundColor]
+							   context:kEditPaneColorChangedNotification];
+	[defaultsController removeObserver:self
+							forKeyPath:[NSString stringWithFormat:@"values.%@", kEditPaneSelectionColor]
+							   context:kEditPaneColorChangedNotification];
+	[defaultsController removeObserver:self
+							forKeyPath:[NSString stringWithFormat:@"values.%@", kEditPaneCaretColor]
+							   context:kEditPaneColorChangedNotification];
 }
 
 - (void)keyDown:(NSEvent *)aEvent {
@@ -69,7 +78,7 @@ - (void)setMarkedText:(id)aString
 		selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange {
 	id resultString;
 	if ([aString isKindOfClass:[NSAttributedString class]]) {
-		resultString = [[aString mutableCopy] autorelease];
+		resultString = [aString mutableCopy];
 		selectedRange = NSMakeRange(0, [resultString length]);
 		NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:
 							   [NSNumber numberWithInt:NSUnderlineStyleSingle], NSUnderlineStyleAttributeName,
@@ -107,9 +116,11 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
 #pragma unused(object)
 #pragma unused(change)
 
-	if ([(NSString *)context isEqualToString:kEditPaneColorChangedNotification]) {
+	if (context == kEditPaneColorChangedNotification) {
 		[self updateColors];
-	}
+	} else {
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+    }
 }
 
 @end