Merge pull request #4 from kamitchell/master

Build cleanly with Xcode 4
rentzsch · Sep 25, 2011 · 2753245 · 2753245
2 parents b562e7c + f691b25
commit 2753245
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 build
-
+xcuserdata
+
 *.pbxuser
 *.perspectivev3
 *.mode1v3

diff --git a/Blitz.xcodeproj/project.pbxproj b/Blitz.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -262,8 +262,12 @@
 /* Begin PBXProject section */
 		2A37F4A9FDCFA73011CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0410;
+			};
 			buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "Blitz" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -385,7 +389,6 @@
 					"\"$(SRCROOT)\"",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -397,7 +400,7 @@
 					"-DNS_BUILD_32_LIKE_64",
 				);
 				PRODUCT_NAME = Blitz;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -420,7 +423,7 @@
 					"-DNS_BUILD_32_LIKE_64",
 				);
 				PRODUCT_NAME = Blitz;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -432,10 +435,10 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
 				PRODUCT_VERSION = 1.0;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -449,9 +452,9 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_VERSION = 1.0;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};

diff --git a/Blitz.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Blitz.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/CounterView.m b/CounterView.m
@@ -110,7 +110,8 @@ - (void)drawRect:(NSRect)rect {
         [self.ringBackground set];
         [outerSlideRingBackground fill];
 
-        [[[[NSShadow alloc] init] autorelease] set];
+        shadow = [[[NSShadow alloc] init] autorelease];
+        [shadow set];
     }
 
     CGFloat degreesElapsed;

diff --git a/SpeakerNotesWindowController.h b/SpeakerNotesWindowController.h
@@ -25,8 +25,9 @@
 
 @property(retain) IBOutlet WebView *webView;
 @property(retain) IBOutlet SpeakerSlidesView *slidesView;
-@property(readwrite) NSUInteger pageIndex;
+@property(readwrite, setter=setPageIndex:) NSUInteger pageIndex;
 
 - (void)changeFont:(id)sender;
+- (void)setPageIndex:(NSUInteger)pageIndex;
 
 @end
diff --git a/SpeakerNotesWindowController.m b/SpeakerNotesWindowController.m
@@ -76,7 +76,8 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)webFrame;
 - (void)setPageIndex:(NSUInteger)pageIndex;
 {
     _pageIndex = pageIndex;
-    id ret = [[_webView windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"displayNotesForSlide(%lu);", pageIndex]];
+    // id ret =
+    [[_webView windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"displayNotesForSlide(%lu);", pageIndex]];
     //NSLog(@"evaluateWebScript returned %@", ret);
 }