Skip to content

Commit 7cc4423

Browse files
committed
Xcode 5.0 support.
1 parent 0441fc7 commit 7cc4423

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

SCXcodeMinimap.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,11 @@
236236
18FE09C51707639E00118FEB /* Debug */ = {
237237
isa = XCBuildConfiguration;
238238
buildSettings = {
239+
CLANG_ENABLE_OBJC_ARC = YES;
239240
COMBINE_HIDPI_IMAGES = YES;
240241
DEPLOYMENT_LOCATION = YES;
241242
DSTROOT = "$(HOME)";
242-
GCC_ENABLE_OBJC_GC = supported;
243+
GCC_ENABLE_OBJC_GC = "";
243244
GCC_PRECOMPILE_PREFIX_HEADER = YES;
244245
GCC_PREFIX_HEADER = "SCXcodeMinimap/SCXcodeMinimap-Prefix.pch";
245246
INFOPLIST_FILE = "SCXcodeMinimap/SCXcodeMinimap-Info.plist";
@@ -252,10 +253,11 @@
252253
18FE09C61707639E00118FEB /* Release */ = {
253254
isa = XCBuildConfiguration;
254255
buildSettings = {
256+
CLANG_ENABLE_OBJC_ARC = YES;
255257
COMBINE_HIDPI_IMAGES = YES;
256258
DEPLOYMENT_LOCATION = YES;
257259
DSTROOT = "$(HOME)";
258-
GCC_ENABLE_OBJC_GC = supported;
260+
GCC_ENABLE_OBJC_GC = "";
259261
GCC_PRECOMPILE_PREFIX_HEADER = YES;
260262
GCC_PREFIX_HEADER = "SCXcodeMinimap/SCXcodeMinimap-Prefix.pch";
261263
INFOPLIST_FILE = "SCXcodeMinimap/SCXcodeMinimap-Info.plist";

SCXcodeMinimap/SCMiniMapView.m

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@ - (id)initWithFrame:(NSRect)frame
5454
- (void)dealloc
5555
{
5656
[[NSNotificationCenter defaultCenter] removeObserver:self];
57-
58-
[_selectionView release];
59-
[_textView release];
60-
[_backgroundColor release];
61-
[_font release];
62-
[super dealloc];
6357
}
6458

6559
#pragma mark - Lazy Initialization
@@ -197,7 +191,6 @@ - (void)updateTextView
197191
[mutableAttributedString setAttributes:@{NSFontAttributeName: self.font, NSBackgroundColorAttributeName : self.backgroundColor} range:NSMakeRange(0, mutableAttributedString.length)];
198192

199193
[self.textView.textStorage setAttributedString:mutableAttributedString];
200-
[mutableAttributedString release];
201194
}
202195

203196
- (void)resizeWithOldSuperviewSize:(NSSize)oldSize
@@ -248,7 +241,12 @@ - (void)updateSelectionViewAnimated:(BOOL)animated
248241

249242
- (void)layoutManager:(NSLayoutManager *)layoutManager didCompleteLayoutForTextContainer:(NSTextContainer *)textContainer atEnd:(BOOL)layoutFinished
250243
{
251-
if(layoutFinished) {
244+
if([layoutManager isEqual:self.editorTextView.layoutManager]) {
245+
[(id<NSLayoutManagerDelegate>)self.editorTextView layoutManager:layoutManager
246+
didCompleteLayoutForTextContainer:textContainer
247+
atEnd:layoutFinished];
248+
}
249+
else if(layoutFinished) {
252250
[self updateSelectionView];
253251
}
254252
}

SCXcodeMinimap/SCSelectionView.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
@implementation SCSelectionView
1212
@synthesize selectionColor = _selectionColor;
1313

14-
- (void)dealloc
15-
{
16-
[self.selectionColor release];
17-
[super dealloc];
18-
}
19-
2014
- (void)drawRect:(NSRect)dirtyRect
2115
{
2216
[[self selectionColor] setFill];

SCXcodeMinimap/SCXcodeMinimap.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ - (void)createMenuItem
6363
atIndex:[editMenuItem.submenu numberOfItems]];
6464
[editMenuItem.submenu insertItem:miniMapItem
6565
atIndex:[editMenuItem.submenu numberOfItems]];
66-
67-
[miniMapItem release];
6866

6967
if ([[NSUserDefaults standardUserDefaults] boolForKey:SCXodeMinimapIsInitiallyHidden]) {
7068
[self hideMiniMap:miniMapItem];
@@ -161,8 +159,6 @@ - (void)onDidFinishSetup:(NSNotification*)sender
161159
else {
162160
[miniMapView show];
163161
}
164-
165-
[miniMapView release];
166162
}
167163

168164
@end

0 commit comments

Comments
 (0)