kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-06-12 17:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[osx] Allow the user to configure a NSApplication subclass and use that instead."

Browse Source 
This reverts commit 51538c0ac7.

Conflicts:
	test/test/spec/main_spec.rb
This commit is contained in:
Eloy Durán
2014-08-27 19:29:39 +02:00
committed by Watson
parent ea6fd1b2e2
commit 649fc6d6c2
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/motion/project/template/osx/config.rb
View File

@@ -230,36 +230,20 @@ EOS
end
main_txt << <<EOS
RubyMotionInit(argc, argv);
NSApplication *app = [NSClassFromString(@"#{info_plist['NSPrincipalClass']}") sharedApplication];
NSApplication *app = [NSApplication sharedApplication];
[app setDelegate:[NSClassFromString(@"#{delegate_class}") new]];
EOS
if spec_mode
main_txt << "SpecLauncher *specLauncher = [[SpecLauncher alloc] init];\n"
main_txt << "[[NSNotificationCenter defaultCenter] addObserver:specLauncher selector:@selector(appLaunched:) name:NSApplicationDidFinishLaunchingNotification object:nil];\n"
end
if use_application_main_function?
main_txt << "NSApplicationMain(argc, (const char **)argv);\n"
else
main_txt << "[app run];\n"
end
main_txt << <<EOS
NSApplicationMain(argc, (const char **)argv);
[pool release];
rb_exit(0);
return 0;
}
EOS
end
# If the user specifies a custom principal class the NSApplicationMain()
# function will only work if they have also specified a nib or storyboard.
def use_application_main_function?
info = info_plist
if info['NSPrincipalClass'] == 'NSApplication'
true
else
files = info.values_at('NSMainNibFile', 'NSMainStoryboardFile').compact
files.any? { |file| !file.strip.empty? }
end
end
end
end; end