File tree 4 files changed +9
-7
lines changed
4 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
27
27
28
28
if ([self color ] != nil ) {
29
29
[[[self color ] colorWithAlphaComponent: 0.9 ] set ];
30
- NSRectFillUsingOperation (cellFrame, NSCompositePlusDarker );
30
+ NSRectFillUsingOperation (cellFrame, NSCompositingOperationPlusDarker );
31
31
}
32
32
}
33
33
@@ -150,7 +150,7 @@ - (BOOL)performKeyEquivalent:(NSEvent *)event {
150
150
modifierFlags: [event modifierFlags ] & ~NSEventModifierFlagOption
151
151
timestamp: [event timestamp ]
152
152
windowNumber: [event windowNumber ]
153
- context: [event context ]
153
+ context: nil
154
154
characters: [event characters ]
155
155
charactersIgnoringModifiers: [event charactersIgnoringModifiers ]
156
156
isARepeat: [event isARepeat ]
Original file line number Diff line number Diff line change @@ -89,8 +89,10 @@ - (NSAttributedString *) textToScroll
89
89
// Suck the contents of the rich text file into a mutable “attributed string”.
90
90
NSMutableAttributedString * theText ;
91
91
if (path) {
92
- theText = [[NSMutableAttributedString alloc ] initWithPath: path
93
- documentAttributes: NULL ] ;
92
+ theText = [[NSMutableAttributedString alloc ] initWithURL: [NSURL fileURLWithPath: path]
93
+ options: @{}
94
+ documentAttributes: NULL
95
+ error: NULL ];
94
96
// Make up one newline
95
97
NSAttributedString * newline = [[[NSAttributedString alloc ] initWithString: @" \n " ] autorelease ];
96
98
Original file line number Diff line number Diff line change @@ -207,7 +207,7 @@ - (id) initWithLabel:(NSString*)label
207
207
NSView * allOrNoneView_ = [[NSView alloc ] initWithFrame: NSZeroRect ] ;
208
208
NSButton * allButton = [[NSButton alloc ] initWithFrame: NSZeroRect ] ;
209
209
[allButton setFont: [NSFont systemFontOfSize: 13 ]] ;
210
- [allButton setBezelStyle: NSSmallSquareBezelStyle ] ;
210
+ [allButton setBezelStyle: NSBezelStyleSmallSquare ] ;
211
211
[allButton setTitle: NSLocalizedString(@" All" , nil )] ;
212
212
[allButton sizeToFit ] ;
213
213
[allButton setTarget: tableView_] ;
@@ -217,7 +217,7 @@ - (id) initWithLabel:(NSString*)label
217
217
if (allowsEmptySelection) {
218
218
NSButton * noneButton = [[NSButton alloc ] initWithFrame: NSZeroRect ] ; ;
219
219
[noneButton setFont: [NSFont systemFontOfSize: 13 ]] ;
220
- [noneButton setBezelStyle: NSSmallSquareBezelStyle ] ;
220
+ [noneButton setBezelStyle: NSBezelStyleSmallSquare ] ;
221
221
[noneButton setTitle: NSLocalizedString(@" None" , nil )] ;
222
222
[noneButton sizeToFit ] ;
223
223
[noneButton setTarget: tableView_] ;
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ - (NSManagedObjectContext *)managedObjectContext {
63
63
if (!m_managedObjectContext) {
64
64
NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator ];
65
65
if (coordinator) {
66
- m_managedObjectContext = [[NSManagedObjectContext alloc ] init ] ;
66
+ m_managedObjectContext = [[NSManagedObjectContext alloc ] initWithConcurrencyType: NSMainQueueConcurrencyType ] ;
67
67
[m_managedObjectContext setPersistentStoreCoordinator: coordinator] ;
68
68
[m_managedObjectContext setMergePolicy: NSMergeByPropertyObjectTrumpMergePolicy ] ;
69
69
}
You can’t perform that action at this time.
0 commit comments