Revision: 5257
http://skim-app.svn.sourceforge.net/skim-app/?rev=5257&view=rev
Author: hofman
Date: 2009-03-14 15:36:26 +0000 (Sat, 14 Mar 2009)
Log Message:
-----------
use pointers to uninitialized static char variables as KVO observation contexts
Modified Paths:
--------------
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
trunk/SKFontWell.m
trunk/SKMainWindowController.m
trunk/SKNoteWindowController.m
trunk/SKOutlineView.m
trunk/SKPDFDocument.m
trunk/SKPDFView.m
trunk/SKPreferenceController.m
trunk/SKSnapshotWindowController.m
trunk/SKTableView.m
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKBookmarkController.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -79,7 +79,7 @@
static NSString *SKBookmarkChildrenKey = @"children";
static NSString *SKBookmarkLabelKey = @"label";
-static NSString *SKBookmarkPropertiesObservationContext =
@"SKBookmarkPropertiesObservationContext";
+static char SKBookmarkPropertiesObservationContext;
@interface SKBookmarkController (SKPrivate)
@@ -486,9 +486,9 @@
SKBookmark *bm;
while (bm = [bmEnum nextObject]) {
if ([bm bookmarkType] != SKBookmarkTypeSeparator) {
- [bm addObserver:self forKeyPath:SKBookmarkLabelKey
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:SKBookmarkPropertiesObservationContext];
+ [bm addObserver:self forKeyPath:SKBookmarkLabelKey
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:&SKBookmarkPropertiesObservationContext];
if ([bm bookmarkType] == SKBookmarkTypeFolder) {
- [bm addObserver:self forKeyPath:SKBookmarkChildrenKey
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:SKBookmarkPropertiesObservationContext];
+ [bm addObserver:self forKeyPath:SKBookmarkChildrenKey
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:&SKBookmarkPropertiesObservationContext];
[self startObservingBookmarks:[bm children]];
}
}
@@ -526,7 +526,7 @@
#pragma mark KVO
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKBookmarkPropertiesObservationContext) {
+ if (context == &SKBookmarkPropertiesObservationContext) {
SKBookmark *bookmark = (SKBookmark *)object;
id newValue = [change objectForKey:NSKeyValueChangeNewKey];
id oldValue = [change objectForKey:NSKeyValueChangeOldKey];
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKDownloadController.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -52,7 +52,7 @@
static NSString *SKDownloadsWindowFrameAutosaveName = @"SKDownloadsWindow";
-static NSString *SKDownloadPropertiesObservationContext =
@"SKDownloadPropertiesObservationContext";
+static char SKDownloadPropertiesObservationContext;
static NSString *SKDownloadControllerDownloadsKey = @"downloads";
@@ -408,8 +408,8 @@
- (void)startObservingDownloads:(NSArray *)newDownloads {
NSIndexSet *indexes = [NSIndexSet
indexSetWithIndexesInRange:NSMakeRange(0, [newDownloads count])];
- [newDownloads addObserver:self toObjectsAtIndexes:indexes
forKeyPath:SKDownloadFileNameKey options:0
context:SKDownloadPropertiesObservationContext];
- [newDownloads addObserver:self toObjectsAtIndexes:indexes
forKeyPath:SKDownloadStatusKey options:0
context:SKDownloadPropertiesObservationContext];
+ [newDownloads addObserver:self toObjectsAtIndexes:indexes
forKeyPath:SKDownloadFileNameKey options:0
context:&SKDownloadPropertiesObservationContext];
+ [newDownloads addObserver:self toObjectsAtIndexes:indexes
forKeyPath:SKDownloadStatusKey options:0
context:&SKDownloadPropertiesObservationContext];
}
- (void)endObservingDownloads:(NSArray *)oldDownloads {
@@ -419,7 +419,7 @@
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKDownloadPropertiesObservationContext) {
+ if (context == &SKDownloadPropertiesObservationContext) {
if ([keyPath isEqualToString:SKDownloadFileNameKey]) {
[[tableView typeSelectHelper] rebuildTypeSelectSearchCache];
} else if ([keyPath isEqualToString:SKDownloadStatusKey]) {
Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKFontWell.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -54,8 +54,8 @@
NSString *SKFontWellActionKey = @"action";
NSString *SKFontWellTargetKey = @"target";
-static NSString *SKFontWellFontNameObservationContext =
@"SKFontWellFontNameObservationContext";
-static NSString *SKFontWellFontSizeObservationContext =
@"SKFontWellFontSizeObservationContext";
+static char SKFontWellFontNameObservationContext;
+static char SKFontWellFontSizeObservationContext;
@interface SKFontWell (SKPrivate)
@@ -335,9 +335,9 @@
void *context = NULL;
if ([bindingName isEqualToString:SKFontWellFontNameKey])
- context = SKFontWellFontNameObservationContext;
+ context = &SKFontWellFontNameObservationContext;
else if ([bindingName isEqualToString:SKFontWellFontSizeKey])
- context = SKFontWellFontSizeObservationContext;
+ context = &SKFontWellFontSizeObservationContext;
[observableController addObserver:self forKeyPath:keyPath options:0
context:context];
[self observeValueForKeyPath:keyPath ofObject:observableController
change:nil context:context];
@@ -361,9 +361,9 @@
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
NSString *key = nil;
- if (context == SKFontWellFontNameObservationContext)
+ if (context == &SKFontWellFontNameObservationContext)
key = SKFontWellFontNameKey;
- else if (context == SKFontWellFontSizeObservationContext)
+ else if (context == &SKFontWellFontSizeObservationContext)
key = SKFontWellFontSizeKey;
if (key) {
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKMainWindowController.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -138,9 +138,9 @@
static NSString *SKMainWindowFrameAutosaveName = @"SKMainWindow";
-static void *SKNPDFAnnotationPropertiesObservationContext = (void
*)@"SKNPDFAnnotationPropertiesObservationContext";
+static char SKNPDFAnnotationPropertiesObservationContext;
-static void *SKMainWindowDefaultsObservationContext = (void
*)@"SKMainWindowDefaultsObservationContext";
+static char SKMainWindowDefaultsObservationContext;
NSString *SKLeftSidePaneWidthKey = @"SKLeftSidePaneWidth";
NSString *SKRightSidePaneWidthKey = @"SKRightSidePaneWidth";
@@ -2231,7 +2231,7 @@
SKThumbnailSizeKey,
SKSnapshotThumbnailSizeKey,
SKShouldAntiAliasKey,
SKGreekingThresholdKey,
SKTableFontSizeKey, nil]
- context:SKMainWindowDefaultsObservationContext];
+ context:&SKMainWindowDefaultsObservationContext];
}
- (void)unregisterAsObserver {
@@ -2257,7 +2257,7 @@
NSString *key;
while (key = [keyEnumerator nextObject]) {
// We use NSKeyValueObservingOptionOld because when something
changes we want to record the old value, which is what has to be set in the
undo operation. We use NSKeyValueObservingOptionNew because we compare the new
value against the old value in an attempt to ignore changes that aren't really
changes.
- [note addObserver:self forKeyPath:key
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:SKNPDFAnnotationPropertiesObservationContext];
+ [note addObserver:self forKeyPath:key
options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld)
context:&SKNPDFAnnotationPropertiesObservationContext];
}
}
}
@@ -2295,7 +2295,7 @@
#pragma mark KVO
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKMainWindowDefaultsObservationContext) {
+ if (context == &SKMainWindowDefaultsObservationContext) {
// A default value that we are observing has changed
NSString *key = [keyPath substringFromIndex:7];
@@ -2349,7 +2349,7 @@
[self updatePageColumnWidthForTableView:outlineView];
}
- } else if (context == SKNPDFAnnotationPropertiesObservationContext) {
+ } else if (context == &SKNPDFAnnotationPropertiesObservationContext) {
// The value of some note's property has changed
PDFAnnotation *note = (PDFAnnotation *)object;
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKNoteWindowController.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -60,10 +60,10 @@
static NSString *SKKeepNoteWindowsOnTopKey = @"SKKeepNoteWindowsOnTop";
-static void *SKNoteWindowPageObservationContext = (void
*)@"SKNoteWindowPageObservationContext";
-static void *SKNoteWindowBoundsObservationContext = (void
*)@"SKNoteWindowBoundsObservationContext";
-static void *SKNoteWindowDefaultsObservationContext = (void
*)@"SKNoteWindowDefaultsObservationContext";
-static void *SKNoteWindowStringObservationContext = (void
*)@"SKNoteWindowStringObservationContext";
+static char SKNoteWindowPageObservationContext;
+static char SKNoteWindowBoundsObservationContext;
+static char SKNoteWindowDefaultsObservationContext;
+static char SKNoteWindowStringObservationContext;
@implementation SKNoteWindowController
@@ -106,11 +106,11 @@
keepOnTop = [[NSUserDefaults standardUserDefaults]
boolForKey:SKKeepNoteWindowsOnTopKey];
forceOnTop = NO;
- [note addObserver:self forKeyPath:SKNPDFAnnotationPageKey options:0
context:SKNoteWindowPageObservationContext];
- [note addObserver:self forKeyPath:SKNPDFAnnotationBoundsKey options:0
context:SKNoteWindowBoundsObservationContext];
- [note addObserver:self forKeyPath:SKNPDFAnnotationStringKey options:0
context:SKNoteWindowStringObservationContext];
+ [note addObserver:self forKeyPath:SKNPDFAnnotationPageKey options:0
context:&SKNoteWindowPageObservationContext];
+ [note addObserver:self forKeyPath:SKNPDFAnnotationBoundsKey options:0
context:&SKNoteWindowBoundsObservationContext];
+ [note addObserver:self forKeyPath:SKNPDFAnnotationStringKey options:0
context:&SKNoteWindowStringObservationContext];
if ([self isNoteType])
- [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKeys:[NSArray arrayWithObjects:SKAnchoredNoteFontNameKey,
SKAnchoredNoteFontSizeKey, nil] context:SKNoteWindowDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKeys:[NSArray arrayWithObjects:SKAnchoredNoteFontNameKey,
SKAnchoredNoteFontSizeKey, nil]
context:&SKNoteWindowDefaultsObservationContext];
}
return self;
}
@@ -313,7 +313,7 @@
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKNoteWindowDefaultsObservationContext) {
+ if (context == &SKNoteWindowDefaultsObservationContext) {
NSString *key = [keyPath substringFromIndex:7];
if (([key isEqualToString:SKAnchoredNoteFontNameKey] || [key
isEqualToString:SKAnchoredNoteFontSizeKey]) && [self isNoteType] && [[textView
string] length] == 0) {
NSString *fontName = [[NSUserDefaults standardUserDefaults]
stringForKey:SKAnchoredNoteFontNameKey];
@@ -322,9 +322,9 @@
if (font)
[textView setFont:font];
}
- } else if (context == SKNoteWindowBoundsObservationContext || context ==
SKNoteWindowPageObservationContext) {
+ } else if (context == &SKNoteWindowBoundsObservationContext || context ==
&SKNoteWindowPageObservationContext) {
[self updateStatusMessage];
- } else if (context == SKNoteWindowStringObservationContext) {
+ } else if (context == &SKNoteWindowStringObservationContext) {
[self synchronizeWindowTitleWithDocumentName];
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change
context:context];
Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKOutlineView.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -43,7 +43,7 @@
#import "NSUserDefaultsController_SKExtensions.h"
#import "SKStringConstants.h"
-static void *SKOutlineViewDefaultsObservationContext = (void
*)@"SKOutlineViewDefaultsObservationContext";
+static char SKOutlineViewDefaultsObservationContext;
@implementation SKOutlineView
@@ -65,14 +65,14 @@
NSNumber *fontSize = [[NSUserDefaults standardUserDefaults]
objectForKey:SKTableFontSizeKey];
if (fontSize)
[self setFont:[NSFont systemFontOfSize:[fontSize floatValue]]];
- [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKey:SKTableFontSizeKey
context:SKOutlineViewDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKey:SKTableFontSizeKey
context:&SKOutlineViewDefaultsObservationContext];
}
if ([[SKOutlineView superclass] instancesRespondToSelector:_cmd])
[super awakeFromNib];
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKOutlineViewDefaultsObservationContext) {
+ if (context == &SKOutlineViewDefaultsObservationContext) {
NSString *key = [keyPath substringFromIndex:7];
if ([key isEqualToString:SKTableFontSizeKey]) {
[self setFont:[NSFont systemFontOfSize:[[NSUserDefaults
standardUserDefaults] floatForKey:SKTableFontSizeKey]]];
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKPDFDocument.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -89,7 +89,7 @@
static NSString *SKAutoRotatePrintedPagesKey = @"SKAutoRotatePrintedPages";
static NSString *SKDisableReloadAlertKey = @"SKDisableReloadAlert";
-static void *SKPDFDocumentDefaultsObservationContext = (void
*)@"SKPDFDocumentDefaultsObservationContext";
+static char SKPDFDocumentDefaultsObservationContext;
@interface SKPDFDocument (SKPrivate)
@@ -176,7 +176,7 @@
[mainController setOpenMetaRating:openMetaRating];
[self setOpenMetaRating:0.0];
- [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKAutoCheckFileUpdateKey
context:SKPDFDocumentDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKAutoCheckFileUpdateKey
context:&SKPDFDocumentDefaultsObservationContext];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(handleWindowWillCloseNotification:)
name:NSWindowWillCloseNotification object:[mainController window]];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(handleDidRemoveDocumentNotification:)
@@ -1470,7 +1470,7 @@
#pragma mark Notification observation
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKPDFDocumentDefaultsObservationContext) {
+ if (context == &SKPDFDocumentDefaultsObservationContext) {
NSString *key = [keyPath substringFromIndex:7];
if ([key isEqualToString:SKAutoCheckFileUpdateKey]) {
[self checkFileUpdatesIfNeeded];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKPDFView.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -107,7 +107,7 @@
static NSString *SKReadingBarNumberOfLinesKey = @"SKReadingBarNumberOfLines";
-static void *SKPDFViewDefaultsObservationContext = (void
*)@"SKPDFViewDefaultsObservationContext";
+static char SKPDFViewDefaultsObservationContext;
static unsigned int moveReadingBarModifiers = NSAlternateKeyMask;
static unsigned int resizeReadingBarModifiers = NSAlternateKeyMask |
NSShiftKeyMask;
@@ -265,7 +265,7 @@
name:PDFViewScaleChangedNotification object:self];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKeys:
[NSArray arrayWithObjects:SKReadingBarColorKey, SKReadingBarInvertKey,
nil]
- context:SKPDFViewDefaultsObservationContext];
+ context:&SKPDFViewDefaultsObservationContext];
}
- (id)initWithFrame:(NSRect)frameRect {
@@ -2417,7 +2417,7 @@
#pragma mark KVO
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKPDFViewDefaultsObservationContext) {
+ if (context == &SKPDFViewDefaultsObservationContext) {
NSString *key = [keyPath substringFromIndex:7];
if ([key isEqualToString:SKReadingBarColorKey] || [key
isEqualToString:SKReadingBarInvertKey]) {
if (readingBar) {
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKPreferenceController.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -55,8 +55,8 @@
static NSString *SKPreferenceWindowFrameAutosaveName = @"SKPreferenceWindow";
-static void *SKPreferenceWindowDefaultsObservationContext = (void
*)@"SKPreferenceWindowDefaultsObservationContext";
-static void *SKPreferenceWindowUpdaterObservationContext = (void
*)@"SKPreferenceWindowUpdaterObservationContext";
+static char SKPreferenceWindowDefaultsObservationContext;
+static char SKPreferenceWindowUpdaterObservationContext;
@interface SKPreferenceController (Private)
- (void)synchronizeUpdateInterval;
@@ -84,9 +84,9 @@
sud = [NSUserDefaults standardUserDefaults];
sudc = [NSUserDefaultsController sharedUserDefaultsController];
- [sudc addObserver:self forKeys:[NSArray
arrayWithObjects:SKDefaultPDFDisplaySettingsKey,
SKDefaultFullScreenPDFDisplaySettingsKey, nil]
context:SKPreferenceWindowDefaultsObservationContext];
- [[SUUpdater sharedUpdater] addObserver:self
forKeyPath:@"automaticallyChecksForUpdates" options:0
context:SKPreferenceWindowUpdaterObservationContext];
- [[SUUpdater sharedUpdater] addObserver:self
forKeyPath:@"updateCheckInterval" options:0
context:SKPreferenceWindowUpdaterObservationContext];
+ [sudc addObserver:self forKeys:[NSArray
arrayWithObjects:SKDefaultPDFDisplaySettingsKey,
SKDefaultFullScreenPDFDisplaySettingsKey, nil]
context:&SKPreferenceWindowDefaultsObservationContext];
+ [[SUUpdater sharedUpdater] addObserver:self
forKeyPath:@"automaticallyChecksForUpdates" options:0
context:&SKPreferenceWindowUpdaterObservationContext];
+ [[SUUpdater sharedUpdater] addObserver:self
forKeyPath:@"updateCheckInterval" options:0
context:&SKPreferenceWindowUpdaterObservationContext];
}
return sharedPrefenceController;
}
@@ -303,12 +303,12 @@
#pragma mark KVO
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKPreferenceWindowDefaultsObservationContext) {
+ if (context == &SKPreferenceWindowDefaultsObservationContext) {
NSString *key = [keyPath substringFromIndex:7];
if ([key isEqualToString:SKDefaultPDFDisplaySettingsKey] || [key
isEqualToString:SKDefaultFullScreenPDFDisplaySettingsKey]) {
[self updateRevertButtons];
}
- } else if (context == SKPreferenceWindowUpdaterObservationContext) {
+ } else if (context == &SKPreferenceWindowUpdaterObservationContext) {
[self synchronizeUpdateInterval];
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change
context:context];
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKSnapshotWindowController.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -71,7 +71,7 @@
static NSString *SKSnapshotWindowFrameAutosaveName = @"SKSnapshotWindow";
static NSString *SKSnapshotViewChangedNotification =
@"SKSnapshotViewChangedNotification";
-static void *SKSnaphotWindowDefaultsObservationContext = (void
*)@"SKSnaphotWindowDefaultsObservationContext";
+static char SKSnaphotWindowDefaultsObservationContext;
@interface SKSnapshotWindowController (SKPrivate)
- (void)setPageLabel:(NSString *)newPageLabel;
@@ -100,7 +100,7 @@
BOOL keepOnTop = [[NSUserDefaults standardUserDefaults]
boolForKey:SKSnapshotsOnTopKey];
[[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel :
NSNormalWindowLevel];
[[self window] setHidesOnDeactivate:keepOnTop || forceOnTop];
- [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKSnapshotsOnTopKey context:SKSnaphotWindowDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self
forKey:SKSnapshotsOnTopKey context:&SKSnaphotWindowDefaultsObservationContext];
}
- (void)windowDidExpose:(NSNotification *)notification {
@@ -568,7 +568,7 @@
#pragma mark KVO
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKSnaphotWindowDefaultsObservationContext) {
+ if (context == &SKSnaphotWindowDefaultsObservationContext) {
NSString *key = [keyPath substringFromIndex:7];
if ([key isEqualToString:SKSnapshotsOnTopKey]) {
BOOL keepOnTop = [[NSUserDefaults standardUserDefaults]
boolForKey:SKSnapshotsOnTopKey];
Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2009-03-04 22:48:10 UTC (rev 5256)
+++ trunk/SKTableView.m 2009-03-14 15:36:26 UTC (rev 5257)
@@ -43,7 +43,7 @@
#import "NSUserDefaultsController_SKExtensions.h"
#import "SKStringConstants.h"
-static void *SKTableViewDefaultsObservationContext = (void
*)@"SKTableViewDefaultsObservationContext";
+static char SKTableViewDefaultsObservationContext;
@implementation SKTableView
@@ -65,14 +65,14 @@
NSNumber *fontSize = [[NSUserDefaults standardUserDefaults]
objectForKey:SKTableFontSizeKey];
if (fontSize)
[self setFont:[NSFont systemFontOfSize:[fontSize floatValue]]];
- [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKey:SKTableFontSizeKey
context:SKTableViewDefaultsObservationContext];
+ [[NSUserDefaultsController sharedUserDefaultsController]
addObserver:self forKey:SKTableFontSizeKey
context:&SKTableViewDefaultsObservationContext];
}
if ([[SKTableView superclass] instancesRespondToSelector:_cmd])
[super awakeFromNib];
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary *)change context:(void *)context {
- if (context == SKTableViewDefaultsObservationContext) {
+ if (context == &SKTableViewDefaultsObservationContext) {
NSString *key = [keyPath substringFromIndex:7];
if ([key isEqualToString:SKTableFontSizeKey]) {
[self setFont:[NSFont systemFontOfSize:[[NSUserDefaults
standardUserDefaults] floatForKey:SKTableFontSizeKey]]];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit