colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-30 20:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/280north/cappuccino into font-fun

Browse Source
This commit is contained in:
Aparajita Fishman committed 2011-03-10 12:38:37 -05:00
2 parents a8d07961c0 acf7ef3a96
commit f93aa2c5bc
4 files changed
+21 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPWebView.j
+1 -1
View File
@@ -883,7 +883,7 @@ CPWebViewAppKitScrollMaxPollCount = 3;
#endif
[self setBackgroundColor:[CPColor whiteColor]];
[_updateEffectiveScrollMode];
[self _updateEffectiveScrollMode];
}
return self;
AppKit/Platform/DOM/CPPlatformWindow+DOM.j
+1 -1
View File
@@ -483,7 +483,7 @@ var ModifierKeyCodes = [
_DOMBodyElement.ondrag = function () { return NO; };
_DOMBodyElement.onselectstart = function () { return _DOMWindow.event.srcElement === _DOMPasteboardElement; };
_DOMWindow.attachEvent("onbeforeunload", function()
_DOMWindow.attachEvent("onunload", function()
{
[self updateFromNativeContentRect];
[self _removeLayers];
Tools/NativeHost/Jakefile
+13 -10
View File
@@ -9,17 +9,20 @@ task ("build", function()
{
if (executableExists("xcodebuild"))
{
if (OS.popen("xcodebuild -version").stdout.read().match("Xcode 4.0"))
stream.print("\0red(Building NativeHost was skipped due to your Xcode 4.0 pre-release not including the Mac OS X 10.5 SDK.\0)");
var args = "-alltargets -configuration Release";
if (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")))
args = "-sdk macosx10.5 " + args;
else
{
if (OS.system("xcodebuild -alltargets -configuration Release"))
OS.exit(1);
rm_rf(FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app"));
FILE.mkdirs(FILE.join($BUILD_CJS_CAPPUCCINO, "support"))
cp_r(FILE.join("build", "Release", "NativeHost.app"), FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app"));
}
args = "-sdk macosx " + args;
if (OS.system("xcodebuild " + args))
OS.exit(1);
rm_rf(FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app"));
FILE.mkdirs(FILE.join($BUILD_CJS_CAPPUCCINO, "support"))
cp_r(FILE.join("build", "Release", "NativeHost.app"), FILE.join($BUILD_CJS_CAPPUCCINO, "support", "NativeHost.app"));
}
else
{
Tools/NativeHost/NativeHost.xcodeproj/project.pbxproj
+6 -2
View File
@@ -254,7 +254,11 @@
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "NativeHost" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* NativeHost */;
projectDirPath = "";
projectRoot = "";
@@ -373,7 +377,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx10.5;
SDKROOT = macosx;
};
name = Debug;
};
@@ -385,7 +389,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = macosx10.5;
SDKROOT = macosx;
};
name = Release;
};