Workaround for terminate: warning when using cibs.

Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I
2009-09-02 23:37:51 -07:00
parent dc85900780
commit 8fc45cf345
3 changed files with 27 additions and 2 deletions
+12 -1
View File
@@ -293,6 +293,11 @@ CPRunContinuesResponse = -1002;
_finishedLaunching = YES;
}
- (void)terminate:(id)aSender
{
[CPPlatform terminateApplication];
}
/*!
Calls \c -finishLaunching method which results in starting
the main event loop.
@@ -407,7 +412,7 @@ CPRunContinuesResponse = -1002;
{
if ([_mainMenu performKeyEquivalent:anEvent])
return YES;
return NO;
}
@@ -492,7 +497,13 @@ CPRunContinuesResponse = -1002;
*/
- (void)setMainMenu:(CPMenu)aMenu
{
if (_mainMenu === aMenu)
return;
_mainMenu = aMenu;
if ([CPPlatform supportsNativeMainMenu])
window.cpSetMainMenu(_mainMenu);
}
- (void)orderFrontColorPanel:(id)aSender
+4 -1
View File
@@ -91,7 +91,10 @@ var _CPMenuBarVisible = NO,
return;
_CPMenuBarVisible = menuBarShouldBeVisible;
if ([CPPlatform supportsNativeMainMenu])
return;
if (menuBarShouldBeVisible)
{
if (!_CPMenuBarSharedWindow)
+11
View File
@@ -34,4 +34,15 @@
return CPFeatureIsCompatible(CPHTMLDragAndDropFeature);
}
+ (BOOL)supportsNativeMainMenu
{
return (typeof window["cpSetMainMenu"] === "function");
}
+ (void)terminateApplication
{
if (typeof window["cpTerminate"] === "function")
window.cpTerminate();
}
@end