Changes required for supporting Apple appstore.

- Use system instaled WebKit.
- Update some deprecated OSX APIs.
- Bump up min deployment to 10.5

installer/osx/Controller.mm

@@ -100,8 +100,8 @@ -(void)dealloc
 
     if (temporaryDirectory)
     {
-        [[NSFileManager defaultManager] 
-            removeFileAtPath:temporaryDirectory handler:nil];
+        [[NSFileManager defaultManager]
+            removeItemAtPath:temporaryDirectory error:nil];
         [temporaryDirectory release];
     }
 
@@ -662,7 +662,7 @@ -(void)applicationDidFinishLaunching:(NSNotification *) notif
         // Remove the update file as soon as possible, so that if the installation
         // fails the application will still start. We can always fetch the update
         // later.
-        [[NSFileManager defaultManager] removeFileAtPath:updateFile handler:nil];
+        [[NSFileManager defaultManager] removeItemAtPath:updateFile error:nil];
     }
 
     std::string tempDir = FileUtils::GetTempDirectory();

modules/ti.Filesystem/File.cpp

@@ -598,7 +598,7 @@ void File::GetSpaceAvailable(const ValueList& args, KValueRef result)
 
 #ifdef OS_OSX
     NSString *p = [NSString stringWithCString:this->filename.c_str() encoding:NSUTF8StringEncoding];
-    unsigned long avail = [[[[NSFileManager defaultManager] fileSystemAttributesAtPath:p] objectForKey:NSFileSystemFreeSize] longValue];
+    unsigned long avail = [[[[NSFileManager defaultManager] attributesOfFileSystemForPath:p error:nil] objectForKey:NSFileSystemFreeSize] longValue];
     diskSize = (double)avail;
 #elif defined(OS_WIN32)
     unsigned __int64 i64FreeBytesToCaller;

modules/ti.UI/SConscript

@@ -9,6 +9,13 @@ build.add_thirdparty(env, 'poco')
 build.add_thirdparty(env, 'webkit')
 env.Append(LIBS=['tiappmodule'])
 
+# If we are on Mac use the system installed WebKit.
+# Otherwise use our build of WebKit on all other platforms.
+if build.is_osx():
+    env.Append(FRAMEWORKS=['WebKit', 'JavaScriptCore'])
+else:
+    build.add_thirdparty(env, 'webkit')
+
 sources = Glob('*.cpp') + ['url/URLUtils.cpp']
 if build.is_linux():
     sources = sources + Glob('gtk/*.cpp')

modules/ti.UI/UIModule.cpp

@@ -18,7 +18,6 @@
 
 #include <Poco/URI.h>
 
-#include "ScriptEvaluator.h"
 #include "../ti.App/ApplicationConfig.h"
 
 #if defined(OS_OSX)
@@ -53,7 +52,6 @@ void UIModule::Start()
     host->GetGlobalObject()->SetObject("UI", this->uiBinding);
     host->GetGlobalObject()->SetObject("Notification", this->uiBinding);
 
-    ScriptEvaluator::Initialize();
     ApplicationConfig* config = ApplicationConfig::Instance();
     if (!config)
     {

modules/ti.UI/mac/MenuDelegate.h

@@ -18,13 +18,17 @@
 
 #include "MenuMac.h"
 
-@interface MenuDelegate : NSObject
+@interface MenuDelegate : NSObject <NSMenuDelegate>
 {
     Titanium::MenuMac* menu;
     BOOL dirty;
     BOOL registerNative;
 }
 - (id)initWithMenu:(Titanium::MenuMac*)menu willRegister:(BOOL)willRegister;
+
+- (NSInteger)numberOfItemsInMenu:(NSMenu *)menu;
 - (void)menuNeedsUpdate:(NSMenu *)menu;
+
 - (void)markAsDirty;
+
 @end

modules/ti.UI/mac/MenuDelegate.mm

@@ -30,6 +30,12 @@ - (id)initWithMenu:(Titanium::MenuMac*)inMenu willRegister:(BOOL)willRegister
     return self;
 }
 
+- (NSInteger)numberOfItemsInMenu:(NSMenu *)menu
+{
+    // We will setup the menu in menuNeedsUpdate.
+    return -1;
+}
+
 - (void)menuNeedsUpdate:(NSMenu *)nativeMenu
 {
     if (!dirty) {

modules/ti.UI/mac/MenuItemMac.mm

@@ -79,10 +79,6 @@
         // native menu will have to use the title of the item it is attached to.
         [submenu setTitle:nstitle];
     }
-    if ([item menu] != nil)
-    {
-        [[item menu] sizeToFit];
-    }
 }
 
 /*static*/
@@ -105,10 +101,6 @@
         [item setImage:nil];
     }
 
-    if ([item menu] != nil) {
-        [[item menu] sizeToFit];
-    }
-
     if (needsRelease) {
         [image release];
     }

modules/ti.UI/mac/MenuMac.mm

@@ -198,7 +198,6 @@
         int index = [nativeMenu numberOfItems] - rearOffset;
         [nativeMenu insertItem:nativeItem atIndex:index];
     }
-    [nativeMenu sizeToFit];
 }
 
 void MenuMac::AddChildrenToNSArray(NSMutableArray* array)

modules/ti.UI/mac/NativeWindow.h

@@ -21,8 +21,6 @@
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 
-#import <WebKit/WebInspector.h>
-
 #include "../../ti.App/WindowConfig.h"
 
 namespace Titanium {
@@ -33,14 +31,13 @@ class UserWindowMac;
 
 @class WebViewDelegate;
 
-@interface NativeWindow : NSWindow
+@interface NativeWindow : NSWindow <NSWindowDelegate>
 {
     BOOL canReceiveFocus;
     WebView* webView;
     WebViewDelegate* delegate;
     BOOL requiresDisplay;
     AutoPtr<Titanium::UserWindowMac>* userWindow;
-    WebInspector* inspector;
     BOOL fullscreen;
     BOOL focused;
     NSRect savedFrame;